Merge pull request #18 from aerospike/spk/monitoring

- [PROD-1046] - Added new option 'enableAerospikePrometheusExporter' to enable Aerospike Prometheus Exporter sidecar (only) - Added Chart for 4.9
aerospike · Apr 10, 2020 · 2050d96 · 2050d96
2 parents 8a617d5 + b770265
commit 2050d96
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 22 deletions.
diff --git a/docs/aerospike-4.6.0.tgz b/docs/aerospike-4.6.0.tgz
diff --git a/docs/aerospike-4.7.0.tgz b/docs/aerospike-4.7.0.tgz
diff --git a/docs/aerospike-4.8.0.tgz b/docs/aerospike-4.8.0.tgz
diff --git a/docs/aerospike-4.9.0.tgz b/docs/aerospike-4.9.0.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -2,10 +2,28 @@ apiVersion: v1
 entries:
   aerospike:
   - apiVersion: v1
-    appVersion: 4.8.0.6
-    created: "2020-03-16T23:01:17.608415+05:30"
+    appVersion: 4.9.0.3
+    created: "2020-04-10T05:40:06.410341+05:30"
     description: A Helm chart for Aerospike Server Community Edition on Kubernetes
-    digest: 00677c21b1d63b88cc3f1044729a94f8c6780f20f648b3d19c7c628cf646d40e
+    digest: 79b342f226221247b9448f8c813eef3ea8179424e73329469e160b3cbca704bf
+    icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
+    maintainers:
+    - email: [email protected]
+      name: spkesan
+    name: aerospike
+    sources:
+    - https://github.com/aerospike/aerospike-server.docker
+    - https://github.com/aerospike/aerospike-kubernetes
+    - https://github.com/aerospike/aerospike-kubernetes-init
+    - https://github.com/aerospike/aerospike-prometheus-exporter
+    urls:
+    - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.9.0.tgz
+    version: 4.9.0
+  - apiVersion: v1
+    appVersion: 4.8.0.8
+    created: "2020-04-10T05:40:06.407163+05:30"
+    description: A Helm chart for Aerospike Server Community Edition on Kubernetes
+    digest: 7680b768cdfa16f55ff4d40d17472060a089e30ee8a04d9a0be3f2fe44e39687
     icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
     maintainers:
     - email: [email protected]
@@ -20,10 +38,10 @@ entries:
     - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.8.0.tgz
     version: 4.8.0
   - apiVersion: v1
-    appVersion: 4.7.0.11
-    created: "2020-03-16T23:01:17.607033+05:30"
+    appVersion: 4.7.0.12
+    created: "2020-04-10T05:40:06.403601+05:30"
     description: A Helm chart for Aerospike Server Community Edition on Kubernetes
-    digest: 2604162d62b08af86d9996abba19b88d1d794a93052af61d17fbbb4a74525bdb
+    digest: 97f0e4b646145f4d86b393bc31a655ee663cd2db7afbca9547a89cd933c24e16
     icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
     maintainers:
     - email: [email protected]
@@ -38,10 +56,10 @@ entries:
     - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.7.0.tgz
     version: 4.7.0
   - apiVersion: v1
-    appVersion: 4.6.0.13
-    created: "2020-03-16T23:01:17.605315+05:30"
+    appVersion: 4.6.0.14
+    created: "2020-04-10T05:40:06.400172+05:30"
     description: A Helm chart for Aerospike Server Community Edition on Kubernetes
-    digest: b5944cd78bc239856781e1c14d1993923f7d9fc0a7b3e5349da02d60e2bd0262
+    digest: 15f241ba7d3596169b476f81c716a1a3fc8d349770f0df5882365a59852ea5da
     icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
     maintainers:
     - email: [email protected]
@@ -55,4 +73,4 @@ entries:
     urls:
     - https://aerospike.github.io/aerospike-kubernetes/aerospike-4.6.0.tgz
     version: 4.6.0
-generated: "2020-03-16T23:01:17.603744+05:30"
+generated: "2020-04-10T05:40:06.391844+05:30"
diff --git a/helm/CHANGELOG.md b/helm/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 This file documents all notable changes to Aerospike Helm Chart (Community Edition).
 
+## [1.3.0](https://github.com/aerospike/aerospike-kubernetes/releases/tag/1.3.0)
+
+- [CLOUD-7] - Added support for custom service dns domain
+- [PROD-1046] - Added new option `enableAerospikePrometheusExporter` to enable Aerospike Prometheus Exporter sidecar (only)
+- Added Chart `4.9.0` uses Aerospike Server version `4.9.0.3`
+- Chart `4.6.0` updated to use Aerospike Server version `4.6.0.14`
+- Chart `4.7.0` updated to use Aerospike Server version `4.7.0.12`
+- Chart `4.8.0` updated to use Aerospike Server version `4.8.0.8`
+
+
 ## [1.2.1](https://github.com/aerospike/aerospike-kubernetes/releases/tag/1.2.1)
 
 - Fixed alertmanager's default dummy configuration to avoid `CrashLoopBackOff`.

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -16,10 +16,10 @@
 # ------------------------------------------------------------------------------
 
 apiVersion: v1
-appVersion: 4.8.0.6
+appVersion: 4.9.0.3
 description: A Helm chart for Aerospike Server Community Edition on Kubernetes
 name: aerospike
-version: 4.8.0
+version: 4.9.0
 icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
 sources:
 - https://github.com/aerospike/aerospike-server.docker

diff --git a/helm/README.md b/helm/README.md
@@ -264,7 +264,25 @@ helm install --name aerospike-release aerospike/aerospike \
 
 Aerospike Helm Chart provides Aerospike Monitoring Stack which includes an Aerospike prometheus exporter (sidecar), Prometheus statefulset, Grafana statefulset and Alertmanager statefulset.
 
-Aerospike Monitoring can be enabled by setting `enableAerospikeMonitoring` option to `true`.
+#### Deploy Aerospike Prometheus Exporter (only)
+Aerospike Prometheus Exporter (sidecar) can be enabled by setting `enableAerospikePrometheusExporter` option to `true`.
+
+```sh
+helm install aerospike-release aerospike/aerospike \
+			 --set enableAerospikePrometheusExporter=true
+```
+
+For Helm v2,
+
+```sh
+helm install --name aerospike-release aerospike/aerospike \
+			 --set enableAerospikePrometheusExporter=true
+```
+
+#### Deploy Complete Monitoring Stack
+To deploy a complete monitoring stack which includes Prometheus, Grafana and Alertmanager, set `enableAerospikeMonitoring` option to `true`.
+
+Note that, setting `enableAerospikeMonitoring` to `true` will automatically enable Aerospike Prometheus Exporter (sidecar).
 
 ```sh
 helm install aerospike-release aerospike/aerospike \
@@ -298,9 +316,9 @@ Check the below [configuration section](#configuration) or [`values.yaml`](value
 | `terminationGracePeriodSeconds`                       | Number of seconds to wait after `SIGTERM` before force killing the pod.                                                                                                                   | `120`                                                                                                                |
 | `clusterServiceDnsDomain`                             | Kubernetes cluster service DNS domain                                                                                                                                                     | `cluster.local`                                                                                                      |
 | `image.repository`                                    | Aerospike Server Docker Image                                                                                                                                                             | `aerospike/aerospike-server`                                                                                         |
-| `image.tag`                                           | Aerospike Server Docker Image Tag                                                                                                                                                         | `4.8.0.6`                                                                                                            |
+| `image.tag`                                           | Aerospike Server Docker Image Tag                                                                                                                                                         | `4.9.0.3`                                                                                                            |
 | `initImage.repository`                                | Aerospike Kubernetes Init Container Image                                                                                                                                                 | `aerospike/aerospike-kubernetes-init`                                                                                |
-| `initImage.tag`                                       | Aerospike Kubernetes Init Container Image Tag                                                                                                                                             | `1.0.0`                                                                                                              |
+| `initImage.tag`                                       | Aerospike Kubernetes Init Container Image Tag                                                                                                                                             | `1.1.0`                                                                                                              |
 | `autoGenerateNodeIds`                                 | Auto generate and assign node-id(s) based on Pod's Ordinal Index                                                                                                                          | `false`                                                                                                              |
 | `aerospikeNamespace`                                  | Aerospike Namespace name                                                                                                                                                                  | `test`                                                                                                               |
 | `aerospikeNamespaceMemoryGB`                          | Aerospike Namespace Memory in GB                                                                                                                                                          | `1`                                                                                                                  |
@@ -328,6 +346,7 @@ Check the below [configuration section](#configuration) or [`values.yaml`](value
 | `confFilePath`                                        | Custom aerospike.conf file path on helm client machine (To be used during the runtime, `helm install` .. etc)                                                                             | `not defined`                                                                                                        |
 | `prometheus.aerospikeAlertRulesFilePath`              | Aerospike alert rules configuration file location on helm client machine (To be used during the runtime, `helm install` .. etc)                                                           | `not defined`                                                                                                        |
 | `alertmanager.alertmanagerConfFilePath`               | Alertmanager configuration file location on helm client machine (To be used during the runtime, `helm install` .. etc)                                                                    | `not defined`                                                                                                        |
+| `enableAerospikePrometheusExporter` 	                | Enable Sidecar Aerospike Prometheus Exporter (only)                                                                                                                                               | `false`					   	                                                                                       |
 | `enableAerospikeMonitoring`		 	                | Enable Aerospike Monitoring - sidecar prometheus exporter, Prometheus, Grafana, Alertmanager stack                                                                                        | `false`					   	                                                                                       |
 | `exporter.repository`                                 | Aerospike prometheus exporter image repository                                                                                                                                            | `aerospike/aerospike-prometheus-exporter`                                                                            |
 | `exporter.tag`                                        | Aerospike prometheus exporter image tag                                                                                                                                                   | `1.0.0`                                                                                                              |

diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml
@@ -42,7 +42,7 @@ data:
   {{ end }}
 
   # Add aerospike-prometheus-exporter config template to config if monitoring is enabled and if the file is available
-  {{- if .Values.enableAerospikeMonitoring }}
+  {{- if or (eq .Values.enableAerospikeMonitoring true) (eq .Values.enableAerospikePrometheusExporter true) }}
   {{ if .Files.Get "files/ape.toml.template" }}
   ape.toml.template: {{ tpl (.Files.Get "files/ape.toml.template") . | quote }}
   {{ end }}

diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
@@ -32,7 +32,7 @@ spec:
   ports:
   - port: {{ .Values.aerospikeClientPort | default 3000 }}
     name: aerospike-client
-  {{- if .Values.enableAerospikeMonitoring }}
+  {{- if or (eq .Values.enableAerospikeMonitoring true) (eq .Values.enableAerospikePrometheusExporter true) }}
   - port: {{ .Values.exporter.agentBindPort | default 9145 }}
     name: aerospike-prometheus-exporter
   {{- end }}

diff --git a/helm/templates/statefulset.yaml b/helm/templates/statefulset.yaml
@@ -174,7 +174,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-      {{- if .Values.enableAerospikeMonitoring }}
+      {{- if or (eq .Values.enableAerospikeMonitoring true) (eq .Values.enableAerospikePrometheusExporter true) }}
       - name: aerospike-prometheus-exporter
         image: "{{ .Values.exporterImage.repository }}:{{ .Values.exporterImage.tag }}"
         args: ["aerospike-prometheus-exporter", "--config", "/etc/aerospike-prometheus-exporter/ape.toml"]
@@ -232,7 +232,7 @@ spec:
           mountPath: /etc/aerospike
         - name: initconfigs
           mountPath: /configs
-        {{- if .Values.enableAerospikeMonitoring }}
+        {{- if or (eq .Values.enableAerospikeMonitoring true) (eq .Values.enableAerospikePrometheusExporter true) }}
         - name: apeconfdir
           mountPath: /etc/aerospike-prometheus-exporter
         {{- end }}
@@ -270,7 +270,7 @@ spec:
         - name: ENABLE_EXT_IP_SERVICES
           value: {{ .Values.enableExternalIpServices | default false | quote }}
       volumes:
-      {{- if .Values.enableAerospikeMonitoring }}
+      {{- if or (eq .Values.enableAerospikeMonitoring true) (eq .Values.enableAerospikePrometheusExporter true) }}
       - name: apeconfdir
         emptyDir: {}
       {{- end }}

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -38,15 +38,15 @@ clusterServiceDnsDomain: cluster.local
 
 image:
   repository: aerospike/aerospike-server
-  tag: 4.8.0.6
+  tag: 4.9.0.3
 
 ### -------------------------------
 ### Aerospike init container image
 ### -------------------------------
 
 initImage:
   repository: aerospike/aerospike-kubernetes-init
-  tag: 1.0.0
+  tag: 1.1.0
 
 
 ### ---------------------------------
@@ -195,6 +195,10 @@ resources: {}
 ### Aerospike Monitoring Stack Configuration
 ### -----------------------------------------
 
+# Enable Aerospike Prometheus Exporter ONLY - sidecar - aerospike prometheus exporter.
+# If enableAerospikeMonitoring is set to true, no need to set enableAerospikePrometheusExporter to true.
+enableAerospikePrometheusExporter: false
+
 # Enable Aerospike Monitoring - sidecar prometheus exporter, Prometheus, Grafana, Alertmanager stack
 enableAerospikeMonitoring: false