Compare commits

...

6 commits

43 changed files with 29 additions and 44 deletions

View file

@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml

View file

@ -18,4 +18,4 @@ spec:
wait: false wait: false
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 5m timeout: 5m

View file

@ -9,7 +9,7 @@ spec:
chart: chart:
spec: spec:
chart: grafana chart: grafana
version: 8.3.6 version: 8.3.7
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: grafana name: grafana

View file

@ -26,4 +26,4 @@ spec:
substitute: substitute:
APP: *app APP: *app
DB_NAME: grafana DB_NAME: grafana
DB_USER: grafana DB_USER: grafana

View file

@ -19,4 +19,4 @@ spec:
- key: alertmanager.yaml - key: alertmanager.yaml
dataFrom: dataFrom:
- extract: - extract:
key: pushover key: pushover

View file

@ -13,4 +13,4 @@ configMapGenerator:
files: files:
- alertmanager.yaml=./resources/alertmanager.yaml - alertmanager.yaml=./resources/alertmanager.yaml
generatorOptions: generatorOptions:
disableNameSuffixHash: true disableNameSuffixHash: true

View file

@ -16,4 +16,4 @@ spec:
matchNames: matchNames:
- database - database
podMetricsEndpoints: podMetricsEndpoints:
- port: admin - port: admin

View file

@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./crunchy-postgres.yaml - ./crunchy-postgres.yaml
- ./dragonflydb.yaml - ./dragonflydb.yaml

View file

@ -3,4 +3,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./prometheusrule.yaml - ./prometheusrule.yaml

View file

@ -34,4 +34,4 @@ spec:
expr: node_zfs_zpool_state{state!="online"} > 0 expr: node_zfs_zpool_state{state!="online"} > 0
for: 15m for: 15m
labels: labels:
severity: critical severity: critical

View file

@ -65,4 +65,4 @@ receivers:
[{{ "{{" }} .Status | toUpper {{ "}}" }}{{ "{{" }} if eq .Status "firing" {{ "}}" }}:{{ "{{" }} .Alerts.Firing | len {{ "}}" }}{{ "{{" }} end {{ "}}" }}] [{{ "{{" }} .Status | toUpper {{ "}}" }}{{ "{{" }} if eq .Status "firing" {{ "}}" }}:{{ "{{" }} .Alerts.Firing | len {{ "}}" }}{{ "{{" }} end {{ "}}" }}]
token: "{{ .alertmanager_token }}" token: "{{ .alertmanager_token }}"
url_title: View in Alertmanager url_title: View in Alertmanager
user_key: "{{ .userkey_jahanson }}" user_key: "{{ .userkey_jahanson }}"

View file

@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./node-exporter.yaml - ./node-exporter.yaml
- ./zfs-exporter.yaml - ./zfs-exporter.yaml

View file

@ -8,4 +8,4 @@ spec:
staticConfigs: staticConfigs:
- targets: - targets:
- 10.1.1.1:9100 - 10.1.1.1:9100
metricsPath: /metrics metricsPath: /metrics

View file

@ -8,4 +8,4 @@ spec:
staticConfigs: staticConfigs:
- targets: - targets:
- 10.1.1.13:9134 - 10.1.1.13:9134
metricsPath: /metrics metricsPath: /metrics

View file

@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./externalsecret.yaml - ./externalsecret.yaml
- ./helmrelease.yaml - ./helmrelease.yaml

View file

@ -2,4 +2,4 @@
type: REDIS type: REDIS
config: config:
addr: dragonfly.database.svc.cluster.local:6379 addr: dragonfly.database.svc.cluster.local:6379
db: 1 db: 1

View file

@ -100,4 +100,4 @@ spec:
hostPath: /var/log hostPath: /var/log
hostPathType: Directory hostPathType: Directory
globalMounts: globalMounts:
- readOnly: true - readOnly: true

View file

@ -10,4 +10,4 @@ configMapGenerator:
files: files:
- vector.yaml=./resources/vector.yaml - vector.yaml=./resources/vector.yaml
generatorOptions: generatorOptions:
disableNameSuffixHash: true disableNameSuffixHash: true

View file

@ -19,4 +19,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: vector-agent name: vector-agent
namespace: observability namespace: observability

View file

@ -22,4 +22,4 @@ sinks:
compression: true compression: true
version: "2" version: "2"
address: vector-aggregator.observability.svc.cluster.local:6010 address: vector-aggregator.observability.svc.cluster.local:6010
inputs: ["kubernetes_source"] inputs: ["kubernetes_source"]

View file

@ -17,4 +17,4 @@ spec:
GEOIPUPDATE_LICENSE_KEY: "{{ .vector_license_key }}" GEOIPUPDATE_LICENSE_KEY: "{{ .vector_license_key }}"
dataFrom: dataFrom:
- extract: - extract:
key: maxmind key: maxmind

View file

@ -10,4 +10,4 @@ configMapGenerator:
files: files:
- vector.yaml=./resources/vector.yaml - vector.yaml=./resources/vector.yaml
generatorOptions: generatorOptions:
disableNameSuffixHash: true disableNameSuffixHash: true

View file

@ -129,4 +129,4 @@ sinks:
remove_label_fields: true remove_label_fields: true
remove_timestamp: true remove_timestamp: true
labels: labels:
hostname: '{{ host }}' hostname: '{{ host }}'

View file

@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./agent - ./agent
- ./aggregator - ./aggregator

View file

@ -20,4 +20,4 @@ spec:
wait: false wait: false
interval: 30m interval: 30m
retryInterval: 1m retryInterval: 1m
timeout: 15m timeout: 15m

View file

@ -9,7 +9,7 @@ exclude: |
repos: repos:
- repo: https://github.com/adrienverge/yamllint - repo: https://github.com/adrienverge/yamllint
rev: v1.33.0 rev: v1.35.1
hooks: hooks:
- id: yamllint - id: yamllint
args: args:
@ -17,7 +17,7 @@ repos:
- ".yamllint.yaml" - ".yamllint.yaml"
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0 rev: v4.6.0
hooks: hooks:
- id: trailing-whitespace - id: trailing-whitespace
- id: end-of-file-fixer - id: end-of-file-fixer
@ -29,7 +29,7 @@ repos:
- id: check-executables-have-shebangs - id: check-executables-have-shebangs
- repo: https://github.com/Lucas-C/pre-commit-hooks - repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.4 rev: v1.5.5
hooks: hooks:
- id: forbid-crlf - id: forbid-crlf
- id: forbid-tabs - id: forbid-tabs

View file

@ -1,10 +1,6 @@
{ {
"ansible.validation.lint.arguments": "-c .ansible-lint",
"files.associations": { "files.associations": {
"*.json5": "jsonc", "*.json5": "jsonc",
"**/ansible/**/*.yaml": "ansible",
"**/ansible/**/*.sops.yaml": "yaml",
"**/ansible/**/inventory/**/*.yaml": "yaml",
"**/kubernetes/**/*.sops.toml": "plaintext" "**/kubernetes/**/*.sops.toml": "plaintext"
}, },
"material-icon-theme.folders.associations": { "material-icon-theme.folders.associations": {
@ -24,7 +20,6 @@
}, },
"yaml.schemaStore.enable": true, "yaml.schemaStore.enable": true,
"yaml.schemas": { "yaml.schemas": {
"ansible": "ansible/**/*.yaml",
"kubernetes": "kubernetes/**/*.yaml" "kubernetes": "kubernetes/**/*.yaml"
}, },
"editor.fontFamily": "FiraCode Nerd Font", "editor.fontFamily": "FiraCode Nerd Font",
@ -40,7 +35,5 @@
], ],
"explorer.autoReveal": false, "explorer.autoReveal": false,
"files.trimTrailingWhitespace": true, "files.trimTrailingWhitespace": true,
"ansible.python.interpreterPath": "/usr/bin/python3",
"sops.defaults.ageKeyFile": "age.key", "sops.defaults.ageKeyFile": "age.key",
"ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint"
} }

View file

@ -35,7 +35,7 @@ spec:
app: app:
image: image:
repository: docker.io/ollama/ollama repository: docker.io/ollama/ollama
tag: 0.3.0 tag: 0.3.2
env: env:
- name: OLLAMA_HOST - name: OLLAMA_HOST
value: 0.0.0.0 value: 0.0.0.0

View file

@ -6,13 +6,5 @@ resources:
# Pre Flux-Kustomizations # Pre Flux-Kustomizations
- ./namespace.yaml - ./namespace.yaml
# Flux-Kustomizations # Flux-Kustomizations
- ./alertmanager-silencer/ks.yaml
- ./gatus/ks.yaml - ./gatus/ks.yaml
- ./grafana/ks.yaml
- ./kube-prometheus-stack/ks.yaml
- ./loki/ks.yaml
- ./smartctl-exporter/ks.yaml - ./smartctl-exporter/ks.yaml
# - ./snmp-exporter/ks.yaml
- ./thanos/ks.yaml
# - ./unpoller/ks.yaml
- ./vector/ks.yaml