diff --git a/.renovate/customManagers.json5 b/.renovate/customManagers.json5 index 15ca784..1840864 100644 --- a/.renovate/customManagers.json5 +++ b/.renovate/customManagers.json5 @@ -1,5 +1,14 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "customDatasources": { + "grafana-dashboards": { + "defaultRegistryUrlTemplate": "https://grafana.com/api/dashboards/{{packageName}}", + "format": "json", + "transformTemplates": [ + "{\"releases\":[{\"version\": $string(revision)}]}" + ] + } + }, "customManagers": [ { "customType": "regex", @@ -8,10 +17,21 @@ "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$" ], "matchStrings": [ - "depName=\"(?.*)\"\\n\\s+gnetId:\\s+(?.*?)\\n\\s+revision:\\s+(?.*)" + "depName=\"(?\\S+)\"\\n.*?gnetId: (?\\d+)\\n.*?revision: (?\\d+)" ], "datasourceTemplate": "custom.grafana-dashboards", "versioningTemplate": "regex:^(?\\d+)$" } + ], + "packageRules": [ + { + "addLabels": ["renovate/grafana-dashboard"], + "commitMessageExtra": "to revision {{newVersion}}", + "commitMessageTopic": "dashboard {{depName}}", + "matchDatasources": ["grafana-dashboards", "custom.grafana-dashboards"], + "matchUpdateTypes": ["major"], + "semanticCommitScope": "grafana-dashboards", + "semanticCommitType": "chore" + } ] } diff --git a/kubernetes/bootstrap/readme.md b/kubernetes/bootstrap/readme.md index 0f3a11e..200a0fe 100644 --- a/kubernetes/bootstrap/readme.md +++ b/kubernetes/bootstrap/readme.md @@ -18,6 +18,7 @@ sops --decrypt kubernetes/bootstrap/flux/git-deploy-key.sops.yaml | kubectl appl sops --decrypt kubernetes/bootstrap/hcloud.sops.yaml | kubectl apply -f - sops --decrypt kubernetes/flux/vars/cluster-secrets.sops.yaml | kubectl apply -f - kubectl apply -f kubernetes/flux/vars/cluster-settings.yaml +kubectl apply -k kubernetes/apps/monitoring/kube-prometheus-stack/crds/ ``` ### Kick off Flux applying this repository diff --git a/renovate.json5 b/renovate.json5 index 80a0e2f..0d49662 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -22,15 +22,6 @@ "kubernetes/.+\\.ya?ml$" ] }, - "customDatasources": { - "grafana-dashboards": { - "defaultRegistryUrlTemplate": "https://grafana.com/api/dashboards/{{packageName}}", - "format": "json", - "transformTemplates": [ - "{\"releases\":[{\"version\": $string(revision)}]}" - ] - } - }, "regexManagers": [ { "description": [