From df8ef582466991d0d2279f6218afc10c491097aa Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Thu, 10 Dec 2020 14:35:48 +0100 Subject: [PATCH] jsonnet,manifests: pin jsonnet deps in release-0.7 Signed-off-by: Damien Grisonnet --- jsonnet/kube-prometheus/jsonnetfile.json | 8 ++++---- jsonnetfile.lock.json | 14 +++++++------- manifests/grafana-dashboardDefinitions.yaml | 4 ++-- manifests/grafana-deployment.yaml | 2 -- manifests/grafana-service.yaml | 1 - manifests/prometheus-rules.yaml | 6 ++---- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index 20d65bdf85..d7c3c677d8 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "grafana" } }, - "version": "master" + "version": "release-0.2" }, { "source": { @@ -35,7 +35,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "master" + "version": "release-0.44" }, { "source": { @@ -44,7 +44,7 @@ "subdir": "" } }, - "version": "master" + "version": "release-0.6" }, { "source": { @@ -62,7 +62,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "master" + "version": "release-1.9" }, { "source": { diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index b4af75ef19..5607924e96 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "grafana" } }, - "version": "7176a6d54b3b19e0529ce574ab5ed427f1c721e9", - "sum": "IrxVMYJrTbDliaVMXX72jUKm8Ju2Za8cAbds7d26wuY=" + "version": "014301fd5f71d8305a395b2fb437089a7b1a3999", + "sum": "RHtpk2c0CcliWyt6F4DIgwpi4cEfHADK7nAxIw6RTGs=" }, { "source": { @@ -59,8 +59,8 @@ "subdir": "" } }, - "version": "ead45674dba3c8712e422d99223453177aac6bf4", - "sum": "3i0NkntlBluDS1NRF+iSc2e727Alkv3ziuVjAP12/kE=" + "version": "1941868d86a7c37e5505a14e3d567bda90e80357", + "sum": "ypWxhZVFWF53k7qIkSpUvnI6IGyFBNKmgrzjNtLwMIM=" }, { "source": { @@ -89,8 +89,8 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "7bdd62593c9273b5179cf3c9d2d819e9d997aaa4", - "sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo=" + "version": "89aaf6c524ee891140c4c8f2a05b1b16f5847309", + "sum": "E1GGavnf9PCWBm4WVrxWnc0FIj72UcbcweqGioWrOdU=" }, { "source": { @@ -99,7 +99,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "22aaf848a27f6e45702131e22a596778686068d5", + "version": "d8b7d3766225908d0239fd0d78258892cd0fc384", "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=" }, { diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index ed5c20a48b..270daab62d 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -16657,7 +16657,7 @@ items: "tableColumn": "", "targets": [ { - "expr": "sum(kubelet_running_pods{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_pod_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", + "expr": "sum(kubelet_running_pods{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}}", @@ -16741,7 +16741,7 @@ items: "tableColumn": "", "targets": [ { - "expr": "sum(kubelet_running_containers{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"}) OR sum(kubelet_running_container_count{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", + "expr": "sum(kubelet_running_containers{cluster=\"$cluster\", job=\"kubelet\", metrics_path=\"/metrics\", instance=~\"$instance\"})", "format": "time_series", "intervalFactor": 2, "legendFormat": "{{instance}}", diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index a0e31f774a..bdc8265147 100644 --- a/manifests/grafana-deployment.yaml +++ b/manifests/grafana-deployment.yaml @@ -13,7 +13,6 @@ spec: template: metadata: annotations: - checksum/grafana-dashboards: ce13f0b50d04c73fb01da858eb1fb608 checksum/grafana-datasources: 48faab41f579fc8efde6034391496f6a labels: app: grafana @@ -118,7 +117,6 @@ spec: nodeSelector: beta.kubernetes.io/os: linux securityContext: - fsGroup: 65534 runAsNonRoot: true runAsUser: 65534 serviceAccountName: grafana diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 5e7e1453ea..3acdf1e888 100644 --- a/manifests/grafana-service.yaml +++ b/manifests/grafana-service.yaml @@ -12,4 +12,3 @@ spec: targetPort: http selector: app: grafana - type: NodePort diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml index 97409d23c9..196fbbcb09 100644 --- a/manifests/prometheus-rules.yaml +++ b/manifests/prometheus-rules.yaml @@ -770,9 +770,8 @@ spec: rules: - alert: KubeStateMetricsListErrors annotations: - description: kube-state-metrics is experiencing errors at an elevated rate in list operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all. + message: kube-state-metrics is experiencing errors at an elevated rate in list operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all. runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubestatemetricslisterrors - summary: kube-state-metrics is experiencing errors in list operations. expr: | (sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m])) / @@ -783,9 +782,8 @@ spec: severity: critical - alert: KubeStateMetricsWatchErrors annotations: - description: kube-state-metrics is experiencing errors at an elevated rate in watch operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all. + message: kube-state-metrics is experiencing errors at an elevated rate in watch operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all. runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubestatemetricswatcherrors - summary: kube-state-metrics is experiencing errors in watch operations. expr: | (sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m])) /