From dbdce14a679ec82f6c4c0aabb1a3b209843bc345 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Sun, 21 Jun 2020 13:01:54 +0200 Subject: [PATCH] update grafana --- graphs/grafana.yaml | 62 +++++++++---------- .../alertmanager-tbrnt-config-secret.yaml | 2 +- monitoring/manifests/grafana-deployment.yaml | 2 +- monitoring/monitoring.jsonnet | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/graphs/grafana.yaml b/graphs/grafana.yaml index 85ada62..ab3ab63 100644 --- a/graphs/grafana.yaml +++ b/graphs/grafana.yaml @@ -6,10 +6,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm annotations: seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' @@ -60,10 +60,10 @@ metadata: name: graphs-grafana-test namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm spec: allowPrivilegeEscalation: true @@ -91,10 +91,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm name: graphs-grafana namespace: graphs @@ -104,10 +104,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm name: graphs-grafana-test namespace: graphs @@ -119,10 +119,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm data: grafana.ini: | @@ -145,10 +145,10 @@ metadata: name: graphs-grafana-test namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm data: run.sh: |- @@ -166,10 +166,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm finalizers: - kubernetes.io/pvc-protection @@ -188,10 +188,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm rules: - apiGroups: ['extensions'] @@ -206,10 +206,10 @@ metadata: name: graphs-grafana-test namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm rules: - apiGroups: ['policy'] @@ -224,10 +224,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -245,10 +245,10 @@ metadata: name: graphs-grafana-test namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io @@ -266,10 +266,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -290,10 +290,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -309,7 +309,7 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs annotations: - checksum/config: fad7ac56fedd479540a5d586af5ee92402a68943366775b6981882fc09794b2a + checksum/config: f34039c0df1008eed25ca27450db228f70591224ed3ceb5530368abccd411749 checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b spec: @@ -393,10 +393,10 @@ metadata: name: graphs-grafana namespace: graphs labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" @@ -422,10 +422,10 @@ kind: Pod metadata: name: graphs-grafana-test labels: - helm.sh/chart: grafana-5.1.0 + helm.sh/chart: grafana-5.2.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: graphs - app.kubernetes.io/version: "7.0.1" + app.kubernetes.io/version: "7.0.3" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test-success diff --git a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml index aadd75b..8ea0727 100644 --- a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml +++ b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml @@ -6,7 +6,7 @@ metadata: namespace: monitoring spec: encryptedData: - alertmanager.yaml: AgC3a8LrOvy9kcsxmYnEXNpL3CS8nrZJJ47R0DXTkyaxsapopJUNJ5y29kq39GK2OKjkgtcKOTDpBfV8nZSqgtkHkSGz6po0gqvzuB07hrqxMlPB3gg8re1oUOzDt3cgk9E4oOtrufIvCmFS+L0SEVJYW7JmMWkApl4nMO8zKMvPTxjJpSAJghpBFt2EM9tMe08TF8Q7lUDAryKB8t1cAbOLL2sk8xhsQUssBevyABzSHSO3HBCrxfK9BF0LgAmzdhRttpHp980wStmLCVqCq5fTOqKVSsEn5tKD0Uly5/wctlf7UzBhvIIx/0dRBL1DWqupGhzC/bIxtFbH3w1ODKksyQ2sByTKENkU9fWcub1llq7WU7X0qtKVSanjyfkIldgVvp1ryX9wiNx1XucWPwNHjfOTAK/p/yNLhwleEUQbvT3TVu73b6BmNSGIi7r7g3B1s0jRyqZbmucXzxr8+4d5V+G1mprEMFUYUpFxHxRbz3Lc63Q7ojo0Q51KKioj3ux3SannFLLaVFGPp3T3ojCm7/PE9QFXYvoYsau7mXg+6C6i0nbamFN3GZkaw5d1FScONojy0m4Kwuh9R5rzoq3GtpPCqIU7AtoP4cWwV1eCmzOHx56wP2lAl9GOSlkJ9C54l+F/uJ4UUwVkBIvHzK2wR8ekR290U0JdiMWUbIHEK3w8YCXw5spDbZB/k/g5dBIzUhAIWlg7EvL00ftojS4RFirrb+tRjW1wU0/uILadf7gbHszQWCps9a7EbVFVWFCUN0phXhmgXSguZjCRktFt+UoFk/kXXM3jcJjDav1zyCjweW5LNmH7vpdd2ilVMmGAvPy9KDBSID/5J+wBQ1iPQPRkhhUGrsQe531dg+g+cbuIXtRbnLKSVlOV5WzSioiJ4JSpGoWqpZla/ODBlw2/fHzIBNc8mAiVAxNXfW9BTzBQ8Jv/7iXfj37XatTzxCAfIQNGSlajZSUkP7QZiyzfJUaeE+Oe6euHQiPMDswywrT2hVRTNIlDo51Y0XbNUFVT1erC399pzSiNETBZ7TYHioaF7ah+2uosC/4BssCE66yXME5RYXihb98QACmP5Gc/qdzTEsHc2h9ybgUoKmuyXgcUsF5KfKRC4ocKhw73QSXJdfwObTyrxzYC/3/Ga6kkOtzoHq/WdS8TJgcIgJ+6y/i0WxhrjukHrKHCqsNr1Hy8TKqgZoJSh8ps6phKNiLPnS27tTd+KvhfbC22fsMk4uTausAq8X917yTxTYqpBUsqm8ACFMIZr+7xj8lzZ0gQLLTwMqLc1h9Bank71++V6ROJVJVeil95eEPXiu/xQhEQ8dEd+D/TvT/i9HP286LggTR/c/PzfbbAz0xugehwMzzrioR/TjNhkuG5BFYMBHGtWcuhvaVn6mUpQjtZtWozBUae2e2MI/O1f6gXFyTosxlX5c1VWZpWkG2ASzuoVtAom4oVJLWraWvJ3Gb8iuWbDxsiV194vRw85H5KswyMJSnRSAF2AfDqmzDHlmxDhYbmJKxouBBEi72+Qdi5Xq/loKlLQmYz5zH41MgDqRNCVhdSnS/hF7t+JtrtMb3/G5YfXe/P3PLaM3R7Ct0B9Ph0GQjVDJ9EWuN/FT13rwlLEIOTcUxaAxhdDQ/Dy+vxKcQE8Yv4O5OUP/ZUWbzbt06mNlLJ5uSyc4jXgpf5XyHo8NQlt4ISdAK6Jh7qF8iyLmga7g== + alertmanager.yaml: AgC3lpA8g0tk5k1CWGqotAfmfUEpl63rM5nEcwitHU+kJT81lPtV3ZYYXvB2I21zhYvRLJTkD8a/GfOY6mV7fXnl9bVgwInnhP2sAKUTtmBNTGtVPolAs0L6Yyodc+OGTK9z/LxYc/K6FzzjSa9BycvvTRI6b2+ccmjE6VEpuQd934ZQH9aJuMhhl+pFpjJdtr2fRH86QMF+hr4MedK/eFNlB2RM++JYW1PhMem5dH9uNMI+W1jKLO+ih2Orgqo8Gsz9YkpK5NysydXwNwFvdBFRXIeBSE495s76I4n5RwamaMfYWwFkgaWc69Z0lOa6zIflXckyOPcyUIBJBQIolv2vDlzMxfMPTMm9Yd7KjMc19IQKLiLmbrxVlfomgnqm4G0svtd8c/Rp/i5T4tStDTb3Jy3UQMOZ1VBO3xqQyOa60Urp1qpHRz5VOmAiB7hics/2GMADhAOCMZF13LEs6QnjLoaZWzfHaug5YoUKXXonfijTFK4ogvZdWJLe899CQg5cVOf+IrhWQpWE7+PoQpjHqz4fS6MHziSwFFPomu4zstLY2LpvtvWCa/6kuXxwIB1gaUIJ/Z4P/W7s0Q62uR5J2guaR7njEd+jyP3wEJlPN0SvIb+q9uXVMPQckpXqD+vY6/8I4Ks5m9nTrFKPSN4v1w/EWZSeS4a914+EUGMOtkFktSzO7+glcnu90LzgKIc/20DxGB4CZS0clHCfQI0P3zVGI+lWjy/AQAEfYtLUaiDzXaAKo2J1bbPqzQMLWA6Yz7vITXiN/DTCOicqBerZZt0y0gX1eENivLSQyWqf9FFUZnG73CEpz5xBSu9ToAL9J1Mkd1jyEVHEySGRGw/zR5JP8q3rmGvd7lN07SvSpl1hayccqEQo1NYzJfI422RTuqS95Fn78qCp84KmYas9hu0+I5lBzitoqtyibiWp4uwlkbeYAE6CCsZkPN35VTeVyLz+mGc7D7dn/QO4jQ6pw/DLO/DQ2//Xqd1npqhQ1MSyYYIIUA10NjnQUm2RggNu3qNA8O+7YzwAK0VJicL76MVEDYVh2Y80gCMKl2iRlDhrkW+EJ1ZQZUp9KLhcTYqmEo3lolkvHonMikwn6x/Ai0eZw7o3XzfiNSx9AjoOpfS3kg7w2y6qRqUt1XhgVL2xIq7JgWnJ3dcjKPVjKoVARhIZKwHIkfXBbYnkGG88MoMlFIhKqi1ixFCo0XRP6exAY+yhQnVbnVn+d/rNOXzHAvR5ydyZwU21AigypFdVnYz3BKyQT+AKf2GK46KfuX3lQuvnInccpyMKURNTJFG7eLL3j1xddMx88OPG22sWoN3JNL+Q5QxgtjoM4mIaHInsEqmBkYD5ICASsQwfxg+YSmkFG1YLiDa7Nf5QB0ZjdbUAzbpuUYUuzHftypdqJf2Gl0851szg1gqumK7PIX7puChw7tdfcJGi+F+n02lK8fi5LJR8JKvGSwxR0YoLFJ2/afEaGB6iJfs2kT90jXZT+DI1WRFigIMZQPHJ0BWrZ05vAfRRWgeeZnvFdfiiuc96fAduDXhJuEo+Qxj6DKgITchMCmzUMm3YG374HMd1uZO6Ir8Ue8GXu+KFg33XxHpC9sZ0bhAn3KM2HRVkZHIrBlhgVgRh2igic8dZzKGUvDgl7GJccFr1yGvEVl8Gf5JApRSIqclVEYqZsbTMHsgquTnJtCWzMvhdookJUXmP78bfjA== template: metadata: creationTimestamp: null diff --git a/monitoring/manifests/grafana-deployment.yaml b/monitoring/manifests/grafana-deployment.yaml index 8e00c15..3bfaf6f 100644 --- a/monitoring/manifests/grafana-deployment.yaml +++ b/monitoring/manifests/grafana-deployment.yaml @@ -19,7 +19,7 @@ spec: - env: - name: GF_INSTALL_PLUGINS value: grafana-piechart-panel - image: grafana/grafana:7.0.1 + image: grafana/grafana:7.0.3 name: grafana ports: - containerPort: 3000 diff --git a/monitoring/monitoring.jsonnet b/monitoring/monitoring.jsonnet index 0d77828..4800eea 100644 --- a/monitoring/monitoring.jsonnet +++ b/monitoring/monitoring.jsonnet @@ -15,7 +15,7 @@ local kp = namespace: 'monitoring', versions+:: { pushgateway: 'v1.1.0', - grafana: '7.0.1', + grafana: '7.0.3', }, prometheus+:: { names: 'k8s',