Current grafana & loki

Yolean · Aug 9, 2021 · 0a683f2 · 0a683f2
1 parent c5aa774
commit 0a683f2
Show file tree

Hide file tree

Showing 23 changed files with 45 additions and 44 deletions.
diff --git a/logs/grafana/templates/clusterrole.yaml b/logs/grafana/templates/clusterrole.yaml
@@ -4,10 +4,10 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
   name: logs-grafana-clusterrole
 rules: []
diff --git a/logs/grafana/templates/clusterrolebinding.yaml b/logs/grafana/templates/clusterrolebinding.yaml
@@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: logs-grafana-clusterrolebinding
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 subjects:
   - kind: ServiceAccount

diff --git a/logs/grafana/templates/configmap.yaml b/logs/grafana/templates/configmap.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 data:
   grafana.ini: |

diff --git a/logs/grafana/templates/deployment.yaml b/logs/grafana/templates/deployment.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -26,19 +26,21 @@ spec:
         app.kubernetes.io/name: grafana
         app.kubernetes.io/instance: logs
       annotations:
-        checksum/config: 5844636c1e91646001a9af13040bc02f6e7755ec82b20355b46cbb1275a6b8cb
+        checksum/config: 825a5aeb7a150bd0055851a2bc93f475e5feb0182592bf0f437c178942f00dbe
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
     spec:
 
       serviceAccountName: logs-grafana
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 472
         runAsGroup: 472
         runAsUser: 472
+      enableServiceLinks: true
       containers:
         - name: grafana
-          image: "grafana/grafana:8.0.3"
+          image: "grafana/grafana:8.1.0"
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config

diff --git a/logs/grafana/templates/podsecuritypolicy.yaml b/logs/grafana/templates/podsecuritypolicy.yaml
@@ -4,12 +4,11 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: logs-grafana
-  namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default'

diff --git a/logs/grafana/templates/role.yaml b/logs/grafana/templates/role.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:      ['extensions']

diff --git a/logs/grafana/templates/rolebinding.yaml b/logs/grafana/templates/rolebinding.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/logs/grafana/templates/service.yaml b/logs/grafana/templates/service.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP

diff --git a/logs/grafana/templates/serviceaccount.yaml b/logs/grafana/templates/serviceaccount.yaml
@@ -4,10 +4,10 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
   name: logs-grafana
   namespace: monitoring
diff --git a/logs/grafana/templates/tests/test-configmap.yaml b/logs/grafana/templates/tests/test-configmap.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana-test
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 data:
   run.sh: |-

diff --git a/logs/grafana/templates/tests/test-podsecuritypolicy.yaml b/logs/grafana/templates/tests/test-podsecuritypolicy.yaml
@@ -4,12 +4,11 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: logs-grafana-test
-  namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   allowPrivilegeEscalation: true

diff --git a/logs/grafana/templates/tests/test-role.yaml b/logs/grafana/templates/tests/test-role.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana-test
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 rules:
 - apiGroups:      ['policy']

diff --git a/logs/grafana/templates/tests/test-rolebinding.yaml b/logs/grafana/templates/tests/test-rolebinding.yaml
@@ -6,10 +6,10 @@ metadata:
   name: logs-grafana-test
   namespace: monitoring
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/logs/grafana/templates/tests/test-serviceaccount.yaml b/logs/grafana/templates/tests/test-serviceaccount.yaml
@@ -4,10 +4,10 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
   name: logs-grafana-test
   namespace: monitoring
diff --git a/logs/grafana/templates/tests/test.yaml b/logs/grafana/templates/tests/test.yaml
@@ -5,10 +5,10 @@ kind: Pod
 metadata:
   name: logs-grafana-test
   labels:
-    helm.sh/chart: grafana-6.13.2
+    helm.sh/chart: grafana-6.15.0
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: logs
-    app.kubernetes.io/version: "8.0.3"
+    app.kubernetes.io/version: "8.1.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     "helm.sh/hook": test-success

diff --git a/logs/loki/templates/podsecuritypolicy.yaml b/logs/loki/templates/podsecuritypolicy.yaml
@@ -6,7 +6,7 @@ metadata:
   name: logs-loki
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     heritage: Helm
     release: logs
 spec:

diff --git a/logs/loki/templates/role.yaml b/logs/loki/templates/role.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     heritage: Helm
     release: logs
 rules:

diff --git a/logs/loki/templates/rolebinding.yaml b/logs/loki/templates/rolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     heritage: Helm
     release: logs
 roleRef:

diff --git a/logs/loki/templates/secret.yaml b/logs/loki/templates/secret.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     release: logs
     heritage: Helm
 data:

diff --git a/logs/loki/templates/service-headless.yaml b/logs/loki/templates/service-headless.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     release: logs
     heritage: Helm
     variant: headless

diff --git a/logs/loki/templates/service.yaml b/logs/loki/templates/service.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     release: logs
     heritage: Helm
   annotations:

diff --git a/logs/loki/templates/serviceaccount.yaml b/logs/loki/templates/serviceaccount.yaml
@@ -5,10 +5,11 @@ kind: ServiceAccount
 metadata:
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     heritage: Helm
     release: logs
   annotations:
     {}
   name: logs-loki
   namespace: monitoring
+automountServiceAccountToken: true
diff --git a/logs/loki/templates/statefulset.yaml b/logs/loki/templates/statefulset.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: monitoring
   labels:
     app: loki
-    chart: loki-2.5.0
+    chart: loki-2.6.0
     release: logs
     heritage: Helm
   annotations:
@@ -29,7 +29,7 @@ spec:
         name: loki
         release: logs
       annotations:
-        checksum/config: cb7caf3124e7dd3ef4fd802d4aa1dbecd94b164b9581c01faf50b6d3c0507551
+        checksum/config: f7402f9775076322ee1fd426648bbccddc4c74fd7c6afaca960b015e23ee25ca
         prometheus.io/port: http-metrics
         prometheus.io/scrape: "true"
     spec:
@@ -43,7 +43,7 @@ spec:
         []
       containers:
         - name: loki
-          image: "grafana/loki:2.2.0"
+          image: "grafana/loki:2.3.0"
           imagePullPolicy: IfNotPresent
           args:
             - "-config.file=/etc/loki/loki.yaml"