-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore(deps): update helm release grafana to 6.43.4 #1527
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Helm Release Diff Report 🔧 Show Report"Path: `k8s/namespaces/base/observability/grafana/helmrelease.yaml` Version: `6.40.0` -> `6.43.4`@@ -10,17 +10,6 @@
name: grafana
namespace: default
---
-# Source: grafana/templates/tests/test-serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- labels:
- app.kubernetes.io/name: grafana
- app.kubernetes.io/instance: grafana
- app.kubernetes.io/managed-by: Helm
- name: grafana-test
- namespace: default
----
# Source: grafana/templates/secret.yaml
apiVersion: v1
kind: Secret
@@ -34,7 +23,7 @@
type: Opaque
data:
admin-user: "YWRtaW4="
- admin-password: "MFVYU212d0tlYXY0bmcySnRiMXJrWVRpUmlqUEZMVUUxVXVSSVd0Rg=="
+ admin-password: "VmFiOUkycGI5VXhvclRDcTBVQktUNk5aS1Rra3lpeERDaGpWMzRzUA=="
ldap-toml: ""
---
# Source: grafana/templates/configmap-dashboard-provider.yaml
@@ -143,179 +132,7 @@
path: /var/lib/grafana/dashboards/default
orgId: 1
type: file
- download_dashboards.sh: |
- #!/usr/bin/env sh
- set -euf
- mkdir -p /var/lib/grafana/dashboards/default
-
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://gitlab.com/uneeq-oss/cert-manager-mixin/-/raw/master/dashboards/cert-manager.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/cert-manager.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/cilium/cilium/v1.9.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/cilium-dashboard.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/cilium-dashboard.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/cilium/cilium/v1.9.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/cilium-operator-dashboard.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/cilium-operator-dashboard.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/cilium/cilium/v1.9.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/hubble-dashboard.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/hubble-dashboard.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/7645/revisions/44/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/istio-control-plane.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/7639/revisions/44/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/istio-mesh.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/11829/revisions/44/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/istio-performence.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/7636/revisions/44/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/istio-service.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/7630/revisions/44/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/istio-workload.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/12171/revisions/2/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/openebs.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/openebs/openebs/v2.3.0/k8s/openebs-pg-dashboard.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/openebs-pg-dashboard.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/bitnami-labs/sealed-secrets/master/contrib/prometheus-mixin/dashboards/sealed-secrets-controller.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/sealed-secrets.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/billimek/prometheus-speedtest-exporter/master/speedtest-exporter.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/speedtest.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/compact.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-compact.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/overview.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-overview.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/query.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-querier.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/receive.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-receiver.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/bucket-replicate.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-replicate.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/rule.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-ruler.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/sidecar.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-sidecar.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/store.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/thanos-store.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/fluxcd/toolkit/main/manifests/monitoring/grafana/dashboards/cluster.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/toolkit-cluster.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://raw.githubusercontent.com/fluxcd/toolkit/main/manifests/monitoring/grafana/dashboards/control-plane.json" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/toolkit-control-plane.json"
- curl -skf \
- --connect-timeout 60 \
- --max-time 60 \
- -H "Accept: application/json" \
- -H "Content-Type: application/json;charset=UTF-8" \
- "https://grafana.com/api/dashboards/11055/revisions/2/download" | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\
- > "/var/lib/grafana/dashboards/default/velero.json"
+ download_dashboards.sh: "#!/usr/bin/env sh\nset -euf\nmkdir -p /var/lib/grafana/dashboards/default\n\ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://gitlab.com/uneeq-oss/cert-manager-mixin/-/raw/master/dashboards/cert-manager.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/cert-manager.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/cilium/cilium/v1.9.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/cilium-dashboard.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/cilium-dashboard.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/cilium/cilium/v1.9.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/cilium-operator-dashboard.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/cilium-operator-dashboard.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/cilium/cilium/v1.9.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/hubble-dashboard.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/hubble-dashboard.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/7645/revisions/44/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/istio-control-plane.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/7639/revisions/44/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/istio-mesh.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/11829/revisions/44/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/istio-performence.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/7636/revisions/44/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/istio-service.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/7630/revisions/44/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/istio-workload.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/12171/revisions/2/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/openebs.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/openebs/openebs/v2.3.0/k8s/openebs-pg-dashboard.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/openebs-pg-dashboard.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/bitnami-labs/sealed-secrets/master/contrib/prometheus-mixin/dashboards/sealed-secrets-controller.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/sealed-secrets.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/billimek/prometheus-speedtest-exporter/master/speedtest-exporter.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/speedtest.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/compact.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-compact.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/overview.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-overview.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/query.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-querier.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/receive.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-receiver.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/bucket-replicate.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-replicate.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/rule.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-ruler.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/sidecar.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-sidecar.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/thanos-io/thanos/b5431c44a6f40fd8f2aef54747dd1eaf9dfcbd25/examples/dashboards/store.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/thanos-store.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/fluxcd/toolkit/main/manifests/monitoring/grafana/dashboards/cluster.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/toolkit-cluster.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://raw.githubusercontent.com/fluxcd/toolkit/main/manifests/monitoring/grafana/dashboards/control-plane.json\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/toolkit-control-plane.json\"\n \ncurl -skf \\\n--connect-timeout 60 \\\n--max-time 60 \\\n-H \"Accept: application/json\" \\\n-H \"Content-Type: application/json;charset=UTF-8\" \\\n \"https://grafana.com/api/dashboards/11055/revisions/2/download\" \\\n | sed '/-- . .. .git .gitattributes .github .gitignore .gitmodules .pre-commit-config.yaml .sops.yaml .sourceignore .taskfiles --/! s/\"datasource\":.*,/\"datasource\": \"Prometheus\",/g' \\\n> \"/var/lib/grafana/dashboards/default/velero.json\"\n"
---
# Source: grafana/templates/dashboards-json-configmap.yaml
apiVersion: v1
@@ -330,25 +147,6 @@
dashboard-provider: default
data: {}
---
-# Source: grafana/templates/tests/test-configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-test
- namespace: default
- labels:
- app.kubernetes.io/name: grafana
- app.kubernetes.io/instance: grafana
- app.kubernetes.io/managed-by: Helm
-data:
- run.sh: |-
- @test "Test Health" {
- url="http://grafana/api/health"
-
- code=$(wget --server-response --spider --timeout 90 --tries 10 ${url} 2>&1 | awk '/^ HTTP/{print $2}')
- [ "$code" == "200" ]
- }
----
# Source: grafana/templates/clusterrole.yaml
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
@@ -397,22 +195,6 @@
verbs: ['use']
resourceNames: [grafana]
---
-# Source: grafana/templates/tests/test-role.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
- name: grafana-test
- namespace: default
- labels:
- app.kubernetes.io/name: grafana
- app.kubernetes.io/instance: grafana
- app.kubernetes.io/managed-by: Helm
-rules:
- - apiGroups: ['policy']
- resources: ['podsecuritypolicies']
- verbs: ['use']
- resourceNames: [grafana-test]
----
# Source: grafana/templates/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
@@ -432,25 +214,6 @@
name: grafana
namespace: default
---
-# Source: grafana/templates/tests/test-rolebinding.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: grafana-test
- namespace: default
- labels:
- app.kubernetes.io/name: grafana
- app.kubernetes.io/instance: grafana
- app.kubernetes.io/managed-by: Helm
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: grafana-test
-subjects:
- - kind: ServiceAccount
- name: grafana-test
- namespace: default
----
# Source: grafana/templates/service.yaml
apiVersion: v1
kind: Service
@@ -497,10 +260,10 @@
app.kubernetes.io/name: grafana
app.kubernetes.io/instance: grafana
annotations:
- checksum/config: 6728d1e0c2a1a1d275afe4eef3691132314b67307067811cf507199609c59979
- checksum/dashboards-json-config: bcb1cc5e2519f16e6835b628b25446f4dfa19a06fad3dd9bd21bc4e201d576ec
- checksum/sc-dashboard-provider-config: cba1d584b55a7a4cede848cac2175b8c10521a041b30043fb5fe3b169d2e9e89
- checksum/secret: 047d32b1fe9316bcc5e7a5ad1ab4b28916748b7bde692f4b27e551565b72cfb3
+ checksum/config: 29ad86e75c53ed71142447e75313c02e9a9722d6a9b372d30f4729081458cef2
+ checksum/dashboards-json-config: 80e0137a56c5a70f67597e4e50e91f6c50c66479bc23978f233772681c806d44
+ checksum/sc-dashboard-provider-config: 233c47e68e21b88d28bd209add6129e9e67995917c1c08eaec9d2ff9e8e44691
+ checksum/secret: 70046f4b06a362dcf8ed56061d1e97ddab11f5a5948841881ac0c083260426ab
spec:
serviceAccountName: grafana
automountServiceAccountToken: true
@@ -572,7 +335,7 @@
- name: sc-datasources-volume
mountPath: "/etc/grafana/provisioning/datasources"
- name: grafana
- image: "grafana/grafana:9.1.6"
+ image: "grafana/grafana:9.2.3"
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
@@ -671,6 +434,83 @@
- name: sc-datasources-volume
emptyDir: {}
---
+# Source: grafana/templates/tests/test-serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ labels:
+ app.kubernetes.io/name: grafana
+ app.kubernetes.io/instance: grafana
+ app.kubernetes.io/managed-by: Helm
+ name: grafana-test
+ namespace: default
+ annotations:
+ "helm.sh/hook": test-success
+ "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+---
+# Source: grafana/templates/tests/test-configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: grafana-test
+ namespace: default
+ annotations:
+ "helm.sh/hook": test-success
+ "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+ labels:
+ app.kubernetes.io/name: grafana
+ app.kubernetes.io/instance: grafana
+ app.kubernetes.io/managed-by: Helm
+data:
+ run.sh: |-
+ @test "Test Health" {
+ url="http://grafana/api/health"
+
+ code=$(wget --server-response --spider --timeout 90 --tries 10 ${url} 2>&1 | awk '/^ HTTP/{print $2}')
+ [ "$code" == "200" ]
+ }
+---
+# Source: grafana/templates/tests/test-role.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+ name: grafana-test
+ namespace: default
+ annotations:
+ "helm.sh/hook": test-success
+ "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+ labels:
+ app.kubernetes.io/name: grafana
+ app.kubernetes.io/instance: grafana
+ app.kubernetes.io/managed-by: Helm
+rules:
+ - apiGroups: ['policy']
+ resources: ['podsecuritypolicies']
+ verbs: ['use']
+ resourceNames: [grafana-test]
+---
+# Source: grafana/templates/tests/test-rolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: grafana-test
+ namespace: default
+ annotations:
+ "helm.sh/hook": test-success
+ "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+ labels:
+ app.kubernetes.io/name: grafana
+ app.kubernetes.io/instance: grafana
+ app.kubernetes.io/managed-by: Helm
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: grafana-test
+subjects:
+ - kind: ServiceAccount
+ name: grafana-test
+ namespace: default
+---
# Source: grafana/templates/tests/test.yaml
apiVersion: v1
kind: Pod
```" |
🦙 MegaLinter status:
|
Descriptor | Linter | Files | Fixed | Errors | Elapsed time |
---|---|---|---|---|---|
✅ KUBERNETES | kubeconform | 1 | 0 | 0.35s | |
checkov | yes | 334 | 18.45s | ||
✅ REPOSITORY | dustilock | yes | no | 0.25s | |
✅ REPOSITORY | git_diff | yes | no | 0.07s | |
✅ REPOSITORY | secretlint | yes | no | 1.97s | |
trivy | yes | 1 | 22.65s | ||
misspell | 1 | 1 | 0.07s | ||
prettier | 1 | 1 | 0.53s | ||
✅ YAML | yamllint | 1 | 0 | 0.27s |
See errors details in artifact MegaLinter reports on CI Job page
Set VALIDATE_ALL_CODEBASE: true
in mega-linter.yml to validate all sources, not only the diff
72b4c98
to
dea81dd
Compare
dea81dd
to
3f66e85
Compare
3f66e85
to
9b2b7b3
Compare
9b2b7b3
to
a065de6
Compare
a065de6
to
8f64b6c
Compare
8f64b6c
to
888f97c
Compare
888f97c
to
4e92b41
Compare
4e92b41
to
ebabab5
Compare
ebabab5
to
72b3a0d
Compare
72b3a0d
to
4b0cbac
Compare
4b0cbac
to
d131107
Compare
d131107
to
780e85f
Compare
780e85f
to
6d11c5d
Compare
6d11c5d
to
8f8bbe6
Compare
| datasource | package | from | to | | ---------- | ------- | ------ | ------ | | helm | grafana | 6.40.0 | 6.43.4 | Signed-off-by: Jarvis Plus Bot <112913195+jarvis-plus-bot[bot]@users.noreply.github.com>
8f8bbe6
to
ac60672
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
6.40.0
->6.43.4
Release Notes
grafana/helm-charts
v6.43.4
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.43.3
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.43.2
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.43.1
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.43.0
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.42.5
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.42.4
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.42.3
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.42.2
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.42.1
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.42.0
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.41.0
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.40.5
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.40.4
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.40.3
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.40.2
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.40.1
Compare Source
The leading tool for querying and visualizing time series and metrics.
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR has been generated by Renovate Bot.