Merge branch 'main' into main

grafana · Sep 9, 2021 · 2197e96 · 2197e96
2 parents 684a21c + 6909c81
commit 2197e96
Show file tree

Hide file tree

Showing 166 changed files with 6,962 additions and 144 deletions.
diff --git a/charts/enterprise-metrics/CHANGELOG.md b/charts/enterprise-metrics/CHANGELOG.md
@@ -10,7 +10,17 @@ Entries should be ordered as follows:
 
 Entries should include a reference to the Pull Request that introduced the change.
 
-## Unreleased
+## 1.5.2
+
+* [CHANGE] Removed all references to Consul in the yaml files since GEM will be focused on deploying with memberlist. Deleted the multi-kv-consul-primary-values.yaml and multi-kv-memberlist-primary-values.yaml files since they assume you're running Consul as your primary or second kvstore. #674
+
+## 1.5.1
+
+* [BUGFIX] Unused `ingress` configuration section removed from `values.yaml`. #658
+
+## 1.5.0
+
+* [FEATURE] Upgrade to [Grafana Enterprise Metrics v1.5.0](https://grafana.com/docs/metrics-enterprise/latest/downloads/#v150----august-24th-2021). #641
 
 ## 1.4.7
 

diff --git a/charts/enterprise-metrics/Chart.lock b/charts/enterprise-metrics/Chart.lock
@@ -11,8 +11,5 @@ dependencies:
 - name: minio
   repository: https://helm.min.io/
   version: 8.0.9
-- name: consul
-  repository: https://helm.releases.hashicorp.com
-  version: 0.25.0
-digest: sha256:c9c729462e364f64e476603ece88e30288f66662b337ac35bbde7dc8eba95719
-generated: "2021-03-22T17:15:44.263441129Z"
+digest: sha256:a4f19f16d818da7216c6386eb1a8ff941619f100796525098fec318940c7f755
+generated: "2021-09-08T03:07:20.793390675Z"
diff --git a/charts/enterprise-metrics/Chart.yaml b/charts/enterprise-metrics/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 1.5.0
+version: 1.5.2
 appVersion: v1.5.0
 description: 'Grafana Enterprise Metrics'
 engine: gotpl
@@ -28,8 +28,3 @@ dependencies:
     version: 8.0.9
     repository: https://helm.min.io/
     condition: minio.enabled
-  - name: consul
-    alias: consul
-    version: 0.25.0
-    repository: https://helm.releases.hashicorp.com
-    condition: consul.enabled
diff --git a/charts/enterprise-metrics/capped-large.yaml b/charts/enterprise-metrics/capped-large.yaml
@@ -46,15 +46,6 @@ compactor:
       cpu: 2
       memory: 2Gi
 
-consul:
-  resources:
-    requests:
-      cpu: 4
-      memory: 4Gi
-  server:
-    replicas: 3
-    bootstrapExpect: 3
-
 distributor:
   replicas: 15
   resources:

diff --git a/charts/enterprise-metrics/capped-small.yaml b/charts/enterprise-metrics/capped-small.yaml
@@ -46,17 +46,6 @@ compactor:
       cpu: 2
       memory: 2Gi
 
-consul:
-  client:
-    enabled: false
-  resources:
-    requests:
-      cpu: 1
-      memory: 2Gi
-  server:
-    replicas: 3
-    bootstrapExpect: 3
-
 distributor:
   replicas: 3
   resources:

diff --git a/...s/enterprise-metrics/exports/default/apps-v1.Deployment-enterprise-metrics-admin-api.yaml b/...s/enterprise-metrics/exports/default/apps-v1.Deployment-enterprise-metrics-admin-api.yaml
@@ -0,0 +1,117 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: enterprise-metrics-admin-api
+    app.kubernetes.io/managed-by: Helmraiser
+    chart: enterprise-metrics-1.5.2
+    heritage: Helm
+    release: enterprise-metrics
+  name: enterprise-metrics-admin-api
+  namespace: enterprise-metrics
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: enterprise-metrics-admin-api
+      release: enterprise-metrics
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 8085fa0d6f8d4ddd98927fa2add048be11fa43fa868eddd4078f33953aeda9dc
+      labels:
+        app: enterprise-metrics-admin-api
+        gossip_ring_member: "true"
+        name: admin-api
+        release: enterprise-metrics
+        target: admin-api
+    spec:
+      affinity: {}
+      containers:
+      - args:
+        - -target=admin-api
+        - -config.file=/etc/enterprise-metrics/enterprise-metrics.yaml
+        - -memberlist.join=enterprise-metrics-gossip-ring
+        - -admin.client.backend-type=s3
+        - -admin.client.s3.endpoint=enterprise-metrics-minio.enterprise-metrics.svc:9000
+        - -admin.client.s3.bucket-name=enterprise-metrics-admin
+        - -admin.client.s3.access-key-id=enterprise-metrics
+        - -admin.client.s3.secret-access-key=supersecret
+        - -admin.client.s3.insecure=true
+        env: null
+        image: grafana/metrics-enterprise:v1.5.0
+        imagePullPolicy: IfNotPresent
+        livenessProbe: null
+        name: enterprise-metrics
+        ports:
+        - containerPort: 8080
+          name: http-metrics
+          protocol: TCP
+        - containerPort: 9095
+          name: grpc
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: http-metrics
+          initialDelaySeconds: 45
+        resources:
+          requests:
+            cpu: 10m
+            memory: 32Mi
+        securityContext:
+          readOnlyRootFilesystem: true
+        volumeMounts:
+        - mountPath: /etc/enterprise-metrics
+          name: config
+        - mountPath: /var/enterprise-metrics
+          name: runtime-config
+        - mountPath: /license
+          name: license
+        - mountPath: /data
+          name: storage
+          subPath: null
+      initContainers:
+      - command:
+        - /bin/sh
+        - /config/initialize
+        env:
+        - name: MINIO_ENDPOINT
+          value: enterprise-metrics-minio
+        - name: MINIO_PORT
+          value: "9000"
+        image: minio/mc:RELEASE.2020-11-25T23-04-07Z
+        imagePullPolicy: IfNotPresent
+        name: minio-mc
+        volumeMounts:
+        - mountPath: /config
+          name: minio-configuration
+      nodeSelector: {}
+      securityContext: {}
+      serviceAccountName: enterprise-metrics
+      terminationGracePeriodSeconds: 60
+      tolerations: []
+      volumes:
+      - name: config
+        secret:
+          secretName: enterprise-metrics
+      - configMap:
+          name: enterprise-metrics-runtime
+        name: runtime-config
+      - name: license
+        secret:
+          secretName: enterprise-metrics-license
+      - emptyDir: {}
+        name: storage
+      - name: minio-configuration
+        projected:
+          sources:
+          - configMap:
+              name: enterprise-metrics-minio
+          - secret:
+              name: enterprise-metrics-minio
diff --git a/...enterprise-metrics/exports/default/apps-v1.Deployment-enterprise-metrics-distributor.yaml b/...enterprise-metrics/exports/default/apps-v1.Deployment-enterprise-metrics-distributor.yaml
@@ -0,0 +1,105 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: enterprise-metrics-distributor
+    app.kubernetes.io/managed-by: Helmraiser
+    chart: enterprise-metrics-1.5.2
+    heritage: Helm
+    release: enterprise-metrics
+  name: enterprise-metrics-distributor
+  namespace: enterprise-metrics
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: enterprise-metrics-distributor
+      release: enterprise-metrics
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        checksum/config: 8085fa0d6f8d4ddd98927fa2add048be11fa43fa868eddd4078f33953aeda9dc
+      labels:
+        app: enterprise-metrics-distributor
+        gossip_ring_member: "true"
+        name: distributor
+        release: enterprise-metrics
+        target: distributor
+    spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: target
+                operator: In
+                values:
+                - distributor
+            topologyKey: kubernetes.io/hostname
+      containers:
+      - args:
+        - -target=distributor
+        - -config.file=/etc/enterprise-metrics/enterprise-metrics.yaml
+        - -memberlist.join=enterprise-metrics-gossip-ring
+        - -admin.client.backend-type=s3
+        - -admin.client.s3.endpoint=enterprise-metrics-minio.enterprise-metrics.svc:9000
+        - -admin.client.s3.bucket-name=enterprise-metrics-admin
+        - -admin.client.s3.access-key-id=enterprise-metrics
+        - -admin.client.s3.secret-access-key=supersecret
+        - -admin.client.s3.insecure=true
+        env: null
+        image: grafana/metrics-enterprise:v1.5.0
+        imagePullPolicy: IfNotPresent
+        livenessProbe: null
+        name: enterprise-metrics
+        ports:
+        - containerPort: 8080
+          name: http-metrics
+          protocol: TCP
+        - containerPort: 9095
+          name: grpc
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: http-metrics
+          initialDelaySeconds: 45
+        resources:
+          requests:
+            cpu: 100m
+            memory: 512Mi
+        securityContext:
+          readOnlyRootFilesystem: true
+        volumeMounts:
+        - mountPath: /etc/enterprise-metrics
+          name: config
+        - mountPath: /var/enterprise-metrics
+          name: runtime-config
+        - mountPath: /license
+          name: license
+        - mountPath: /data
+          name: storage
+          subPath: null
+      initContainers: []
+      nodeSelector: {}
+      securityContext: {}
+      serviceAccountName: enterprise-metrics
+      terminationGracePeriodSeconds: 60
+      tolerations: []
+      volumes:
+      - name: config
+        secret:
+          secretName: enterprise-metrics
+      - configMap:
+          name: enterprise-metrics-runtime
+        name: runtime-config
+      - name: license
+        secret:
+          secretName: enterprise-metrics-license
+      - emptyDir: {}
+        name: storage