Merge pull request #40 from memphisdev/staging

1.3.1

Author: valeraBr

environments/default.yaml

@@ -1,6 +1,5 @@
-helmVersion: 0.2.1 # Define the version of the superstream helm chart.
+helmVersion: 0.2.3 # Define the version of the superstream helm chart.
 namespace: superstream # Specify the Kubernetes namespace where the resources will be deployed, isolating them within this designated namespace.
 name: <DATAPLANE_NAME> # Define the data plane name within 32 characters, excluding '.', and using only letters, numbers, '-', and '_'.
 accountId: "" # Provide the account ID that is associated with the deployment, which could be used for identifying resources or configurations tied to a specific account.
 activationToken: "" # Enter the activation token required for services or resources that need an initial token for activation or authentication.
-monitoringToken: "" # Observability token

helmfile.yaml

@@ -17,6 +17,8 @@ environments:
     - natsReleaseName: nats # Set the release name for the NATS deployment, which is used to uniquely identify the set of resources deployed for NATS.
     - superstreamReleaseName: superstream # Specify the release name for the Superstream deployment, uniquely identifying the resources for Superstream.
     - telegrafReleaseName: telegraf # Define the release name for the Telegraf deployment, used for identifying the Telegraf resources in the cluster.
+    - natsHelmVersion: 1.1.10
+    - telegrafHelmVersion: 1.8.43
     - controlPlane: broker.superstream.dev # Indicate the control plane configuration or identifier, which may include settings specific to the cluster's control plane.
     - releaseDate: 2024-02-28-12-43
 
@@ -30,7 +32,7 @@ releases:
     installed: true
     namespace: {{ .Values.namespace }}
     chart: nats/nats
-    version: 1.1.10
+    version: {{ .Values.natsHelmVersion }}
     values:
       - container:
           env: 
@@ -71,8 +73,11 @@ releases:
     installed: true
     namespace: {{ .Values.namespace }} 
     chart: influxdata/telegraf 
-    version: 1.8.43
+    version: {{ .Values.telegrafHelmVersion }}
     values:
+      - metrics:
+          internal:
+            collect_memstats: true
       - rbac:
           rules:    
           - apiGroups: [""]
@@ -85,20 +90,39 @@ releases:
           outputs:
             - influxdb_v2:
                 urls:
-                - "https://influxdb.mgmt.memphis-gcp.dev"
+                - "https://superstream-monitoring.mgmt.memphis-gcp.dev"
                 organization: "superstream"
                 bucket: "logs"
                 content_encoding: "gzip"
-                token:  "{{ .Values.monitoringToken }}"
+                http_headers:
+                  Authorization: "{{ .Values.activationToken }}"
                 namepass: ["syslog"]
             - influxdb_v2:
                 urls:
-                - "https://influxdb.mgmt.memphis-gcp.dev"
+                - "https://superstream-monitoring.mgmt.memphis-gcp.dev"
                 organization: "superstream"
                 bucket: "metrics"
                 content_encoding: "gzip"
-                token: "{{ .Values.monitoringToken }}"
-                namedrop: ["syslog"]                         
+                http_headers:
+                  Authorization: "{{ .Values.activationToken }}"
+                namedrop: ["syslog"] 
+          processors:
+            - enum:
+                mapping:
+                  field: "status"
+                  dest: "status_code"
+                  value_mappings:
+                    healthy: 1
+                    problem: 2
+                    critical: 3    
+            - starlark:
+                namepass: ["syslog"]  
+                source: |
+                  def apply(metric):
+                      unique_str = metric.name + str(metric.fields) + str(metric.tags)
+                      random_value = str(hash(unique_str))[-8:]
+                      metric.tags['eventId'] = random_value
+                      return metric                                         
           inputs:
           - syslog:
               server: "udp://:6514"
@@ -112,6 +136,10 @@ releases:
               monitor_kubernetes_pods_port: 7777
               tags:
                 accountId: "{{ .Values.accountId }}_{{ .Values.name }}"
+          - internal:
+              tags:
+                accountId: "{{ .Values.accountId }}_{{ .Values.name }}"
+                chart: "telegraf-{{ .Values.telegrafHelmVersion }}"
 
   - name: {{ .Values.superstreamReleaseName }} 
     installed: true
@@ -122,6 +150,7 @@ releases:
       - config.yaml
       - superstream:
           environment: {{ .Values.name }}
+          ha: {{ .Values.haDeployment }}
       - dataPlane:
           secret:
             activationToken: {{ .Values.activationToken }}

version.conf

@@ -1 +1 @@
-1.3.0
+1.4.0