Merge pull request #87 from superstreamlabs/staging

0.4.7

charts/superstream/Chart.yaml

@@ -25,7 +25,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.6
+version: 0.4.7
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

charts/superstream/charts/telegraf/templates/configmap.yaml

@@ -35,36 +35,31 @@ data:
         "syslog"
       ]
       source = "def apply(metric):\n    unique_str = metric.name + str(metric.fields) + str(metric.tags)\n    random_value = str(hash(unique_str))[-8:]\n    metric.tags['eventId'] = random_value\n    return metric                                         \n"
-    [[outputs.influxdb_v2]]
-      bucket = "logs"
-      content_encoding = "gzip"
+
+    [[outputs.loki]]
+      domain = "https://loki.mgmt.superstream.ai"
+      endpoint = "/loki/api/v1/push"
       namepass = [
         "syslog",
         "telegraf_logs"
       ]
-      organization = "superstream"
-      urls = [
-        "https://superstream-monitoring.mgmt.memphis-gcp.dev"
-      ]
-      [outputs.influxdb_v2.http_headers]
+      [outputs.loki.http_headers]
         Authorization = "$TOKEN"
-    [[outputs.influxdb_v2]]
-      bucket = "metrics"
-      content_encoding = "gzip"
+    [[outputs.http]]
+      data_format = "prometheusremotewrite"
+      method = "POST"
       namedrop = [
         "syslog",
-        "telegraf_logs"
-      ]
-      organization = "superstream"
-      urls = [
-        "https://superstream-monitoring.mgmt.memphis-gcp.dev"
+        "telegraf_logs",
+        "internal"
       ]
-      [outputs.influxdb_v2.http_headers]
-        Authorization = "$TOKEN"
+      url = "https://prometheus.mgmt.superstream.ai/api/v1/write"
+      [outputs.http.headers]
+        Authorization = "$TOKEN"     
     [[inputs.syslog]]
       server = "udp://:6514"
       [inputs.syslog.tags]
-        accountId = "{{ .Values.global.superstreamAccountId }}_{{ .Values.global.environment }}"
+        accountId = "{{ .Values.global.superstreamAccountId }}"
         env = {{ .Values.global.environment | quote }}
     [[inputs.prometheus]]
       kubernetes_label_selector = "app.kubernetes.io/name in (nats, superstream)"
@@ -73,13 +68,9 @@ data:
       monitor_kubernetes_pods_namespace = {{ .Release.Namespace | quote}}
       monitor_kubernetes_pods_port = 7777
       [inputs.prometheus.tags]
-        accountId = "{{ .Values.global.superstreamAccountId }}_{{ .Values.global.environment }}"
-        env = {{ .Values.global.environment | quote }}
-    [[inputs.internal]]
-      [inputs.internal.tags]
-        accountId = "{{ .Values.global.superstreamAccountId }}_{{ .Values.global.environment }}"
+        accountId = "{{ .Values.global.superstreamAccountId }}"
         env = {{ .Values.global.environment | quote }}
-        chart = "telegraf-1.8.48"
+
     [[inputs.tail]]
       data_format = "grok"
       files = [
@@ -92,7 +83,7 @@ data:
       ]
       name_override = "telegraf_logs"
       [inputs.tail.tags]
-        accountId = "{{ .Values.global.superstreamAccountId }}_{{ .Values.global.environment }}"
+        accountId = "{{ .Values.global.superstreamAccountId }}"
         env = {{ .Values.global.environment | quote }}
         appname = "telegraf"
 

charts/superstream/charts/telegraf/values.yaml

@@ -159,8 +159,8 @@ metrics:
     service_address: "http://:8888"
     threshold: 5000.0
   internal:
-    enabled: true
-    collect_memstats: true
+    enabled: false
+    collect_memstats: false
 # Lifecycle hooks
 # hooks:
 #   postStart: ["/bin/sh", "-c", "echo Telegraf started"]

version.conf

@@ -1 +1 @@
-0.4.6
+0.4.7