Compare commits
1 commit
9a77f06f46
...
71895b8d43
Author | SHA1 | Date | |
---|---|---|---|
71895b8d43 |
43 changed files with 44 additions and 29 deletions
|
@ -9,7 +9,7 @@ exclude: |
|
|||
|
||||
repos:
|
||||
- repo: https://github.com/adrienverge/yamllint
|
||||
rev: v1.35.1
|
||||
rev: v1.33.0
|
||||
hooks:
|
||||
- id: yamllint
|
||||
args:
|
||||
|
@ -17,7 +17,7 @@ repos:
|
|||
- ".yamllint.yaml"
|
||||
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v4.6.0
|
||||
rev: v4.5.0
|
||||
hooks:
|
||||
- id: trailing-whitespace
|
||||
- id: end-of-file-fixer
|
||||
|
@ -29,7 +29,7 @@ repos:
|
|||
- id: check-executables-have-shebangs
|
||||
|
||||
- repo: https://github.com/Lucas-C/pre-commit-hooks
|
||||
rev: v1.5.5
|
||||
rev: v1.5.4
|
||||
hooks:
|
||||
- id: forbid-crlf
|
||||
- id: forbid-tabs
|
||||
|
|
7
.vscode/settings.json
vendored
7
.vscode/settings.json
vendored
|
@ -1,6 +1,10 @@
|
|||
{
|
||||
"ansible.validation.lint.arguments": "-c .ansible-lint",
|
||||
"files.associations": {
|
||||
"*.json5": "jsonc",
|
||||
"**/ansible/**/*.yaml": "ansible",
|
||||
"**/ansible/**/*.sops.yaml": "yaml",
|
||||
"**/ansible/**/inventory/**/*.yaml": "yaml",
|
||||
"**/kubernetes/**/*.sops.toml": "plaintext"
|
||||
},
|
||||
"material-icon-theme.folders.associations": {
|
||||
|
@ -20,6 +24,7 @@
|
|||
},
|
||||
"yaml.schemaStore.enable": true,
|
||||
"yaml.schemas": {
|
||||
"ansible": "ansible/**/*.yaml",
|
||||
"kubernetes": "kubernetes/**/*.yaml"
|
||||
},
|
||||
"editor.fontFamily": "FiraCode Nerd Font",
|
||||
|
@ -35,5 +40,7 @@
|
|||
],
|
||||
"explorer.autoReveal": false,
|
||||
"files.trimTrailingWhitespace": true,
|
||||
"ansible.python.interpreterPath": "/usr/bin/python3",
|
||||
"sops.defaults.ageKeyFile": "age.key",
|
||||
"ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint"
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ spec:
|
|||
app:
|
||||
image:
|
||||
repository: docker.io/ollama/ollama
|
||||
tag: 0.3.2
|
||||
tag: 0.3.1
|
||||
env:
|
||||
- name: OLLAMA_HOST
|
||||
value: 0.0.0.0
|
||||
|
|
|
@ -3,4 +3,4 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./helmrelease.yaml
|
||||
- ./helmrelease.yaml
|
|
@ -18,4 +18,4 @@ spec:
|
|||
wait: false
|
||||
interval: 30m
|
||||
retryInterval: 1m
|
||||
timeout: 5m
|
||||
timeout: 5m
|
|
@ -9,7 +9,7 @@ spec:
|
|||
chart:
|
||||
spec:
|
||||
chart: grafana
|
||||
version: 8.3.7
|
||||
version: 8.3.6
|
||||
sourceRef:
|
||||
kind: HelmRepository
|
||||
name: grafana
|
|
@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||
kind: Kustomization
|
||||
resources:
|
||||
- ./externalsecret.yaml
|
||||
- ./helmrelease.yaml
|
||||
- ./helmrelease.yaml
|
|
@ -26,4 +26,4 @@ spec:
|
|||
substitute:
|
||||
APP: *app
|
||||
DB_NAME: grafana
|
||||
DB_USER: grafana
|
||||
DB_USER: grafana
|
|
@ -19,4 +19,4 @@ spec:
|
|||
- key: alertmanager.yaml
|
||||
dataFrom:
|
||||
- extract:
|
||||
key: pushover
|
||||
key: pushover
|
|
@ -13,4 +13,4 @@ configMapGenerator:
|
|||
files:
|
||||
- alertmanager.yaml=./resources/alertmanager.yaml
|
||||
generatorOptions:
|
||||
disableNameSuffixHash: true
|
||||
disableNameSuffixHash: true
|
|
@ -16,4 +16,4 @@ spec:
|
|||
matchNames:
|
||||
- database
|
||||
podMetricsEndpoints:
|
||||
- port: admin
|
||||
- port: admin
|
|
@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||
kind: Kustomization
|
||||
resources:
|
||||
- ./crunchy-postgres.yaml
|
||||
- ./dragonflydb.yaml
|
||||
- ./dragonflydb.yaml
|
|
@ -3,4 +3,4 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./prometheusrule.yaml
|
||||
- ./prometheusrule.yaml
|
|
@ -34,4 +34,4 @@ spec:
|
|||
expr: node_zfs_zpool_state{state!="online"} > 0
|
||||
for: 15m
|
||||
labels:
|
||||
severity: critical
|
||||
severity: critical
|
|
@ -65,4 +65,4 @@ receivers:
|
|||
[{{ "{{" }} .Status | toUpper {{ "}}" }}{{ "{{" }} if eq .Status "firing" {{ "}}" }}:{{ "{{" }} .Alerts.Firing | len {{ "}}" }}{{ "{{" }} end {{ "}}" }}]
|
||||
token: "{{ .alertmanager_token }}"
|
||||
url_title: View in Alertmanager
|
||||
user_key: "{{ .userkey_jahanson }}"
|
||||
user_key: "{{ .userkey_jahanson }}"
|
|
@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||
kind: Kustomization
|
||||
resources:
|
||||
- ./node-exporter.yaml
|
||||
- ./zfs-exporter.yaml
|
||||
- ./zfs-exporter.yaml
|
|
@ -8,4 +8,4 @@ spec:
|
|||
staticConfigs:
|
||||
- targets:
|
||||
- 10.1.1.1:9100
|
||||
metricsPath: /metrics
|
||||
metricsPath: /metrics
|
|
@ -8,4 +8,4 @@ spec:
|
|||
staticConfigs:
|
||||
- targets:
|
||||
- 10.1.1.13:9134
|
||||
metricsPath: /metrics
|
||||
metricsPath: /metrics
|
|
@ -6,5 +6,13 @@ resources:
|
|||
# Pre Flux-Kustomizations
|
||||
- ./namespace.yaml
|
||||
# Flux-Kustomizations
|
||||
- ./alertmanager-silencer/ks.yaml
|
||||
- ./gatus/ks.yaml
|
||||
- ./grafana/ks.yaml
|
||||
- ./kube-prometheus-stack/ks.yaml
|
||||
- ./loki/ks.yaml
|
||||
- ./smartctl-exporter/ks.yaml
|
||||
# - ./snmp-exporter/ks.yaml
|
||||
- ./thanos/ks.yaml
|
||||
# - ./unpoller/ks.yaml
|
||||
- ./vector/ks.yaml
|
|
@ -2,4 +2,4 @@
|
|||
type: REDIS
|
||||
config:
|
||||
addr: dragonfly.database.svc.cluster.local:6379
|
||||
db: 1
|
||||
db: 1
|
|
@ -100,4 +100,4 @@ spec:
|
|||
hostPath: /var/log
|
||||
hostPathType: Directory
|
||||
globalMounts:
|
||||
- readOnly: true
|
||||
- readOnly: true
|
|
@ -10,4 +10,4 @@ configMapGenerator:
|
|||
files:
|
||||
- vector.yaml=./resources/vector.yaml
|
||||
generatorOptions:
|
||||
disableNameSuffixHash: true
|
||||
disableNameSuffixHash: true
|
|
@ -19,4 +19,4 @@ roleRef:
|
|||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: vector-agent
|
||||
namespace: observability
|
||||
namespace: observability
|
|
@ -22,4 +22,4 @@ sinks:
|
|||
compression: true
|
||||
version: "2"
|
||||
address: vector-aggregator.observability.svc.cluster.local:6010
|
||||
inputs: ["kubernetes_source"]
|
||||
inputs: ["kubernetes_source"]
|
|
@ -17,4 +17,4 @@ spec:
|
|||
GEOIPUPDATE_LICENSE_KEY: "{{ .vector_license_key }}"
|
||||
dataFrom:
|
||||
- extract:
|
||||
key: maxmind
|
||||
key: maxmind
|
|
@ -10,4 +10,4 @@ configMapGenerator:
|
|||
files:
|
||||
- vector.yaml=./resources/vector.yaml
|
||||
generatorOptions:
|
||||
disableNameSuffixHash: true
|
||||
disableNameSuffixHash: true
|
|
@ -129,4 +129,4 @@ sinks:
|
|||
remove_label_fields: true
|
||||
remove_timestamp: true
|
||||
labels:
|
||||
hostname: '{{ host }}'
|
||||
hostname: '{{ host }}'
|
|
@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
|||
kind: Kustomization
|
||||
resources:
|
||||
- ./agent
|
||||
- ./aggregator
|
||||
- ./aggregator
|
|
@ -20,4 +20,4 @@ spec:
|
|||
wait: false
|
||||
interval: 30m
|
||||
retryInterval: 1m
|
||||
timeout: 15m
|
||||
timeout: 15m
|
Loading…
Reference in a new issue