Merge pull request #42 from nagaraj-citrix/master

Citrix Observability Exporter configmap update for releae 1.2.001
netscaler · Oct 1, 2020 · a1979bc · a1979bc
2 parents 0715dc9 + d20542e
commit a1979bc
Show file tree

Hide file tree

Showing 11 changed files with 165 additions and 155 deletions.
diff --git a/citrix-cloud-native/Chart.yaml b/citrix-cloud-native/Chart.yaml
@@ -30,7 +30,7 @@ dependencies:
     condition: cnc.enabled
     alias: cnc
   - name: citrix-observability-exporter
-    version: "1.1.001"
+    version: "1.2.001"
     condition: coe.enabled
     alias: coe
   - name: citrix-ipam-controller

diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml
@@ -1,12 +1,15 @@
 apiVersion: v2
-appVersion: "1.1.001"
+appVersion: "1.2.001"
 description: A Helm chart for Citrix Observability Exporter
 name: citrix-observability-exporter
-version: 1.1.001
+version: 1.2.001
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png 
 home: https://www.citrix.com
 sources:
 - https://github.com/citrix/citrix-observability-exporter
 maintainers:
 - name: SathiyaCV
   email: sathiya.viswanathan@citrix.com
+- name: NagarajHarikar
+  email: nagarajb.harikar@citrix.com
+
diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml
@@ -5,80 +5,74 @@ metadata:
 data:
   lstreamd_default.conf: |
     {
+        "Endpoints": {
 {{- if .Values.kafka.enabled }}
-        "RecordType": {
-            "HTTP": "all",
-            "TCP": "all",
-            "SWG": "all",
-            "VPN": "all",
-            "NGS": "all",
-            "ICA": "all",
-            "APPFW": "none",
-            "BOT": "none",
-            "VIDEOOPT": "none",
-            "BURST_CQA": "none",
-            "SLA": "none"
-        },
-{{- if .Values.ns_tracing.enabled }}
-        "EnableTracing": "yes",
-        "TracingServer": {{ .Values.ns_tracing.server  | default "zipkin:9411/api/v1/spans" | quote }},
-{{- end}}
-        "ProcessAlways": "yes",
-        "ProcessorMode": "avro",
-        "FileSizeMax": "40",
-        "SkipAvro": "no",
-        "EnableKafka": "yes",
-        "KafkaBroker": {{ .Values.kafka.broker | quote }},
-        "KafkaTopic": {{ .Values.kafka.topic  | default "HTTP" | quote }},
-        "ProcessYieldTimeOut": "500",
-        "FileStorageLimit": "1000"
+          "KAFKA": {
+              "ServerUrl": {{ .Values.kafka.broker | quote }},
+              "KafkaTopic": {{ .Values.kafka.topic  | default "HTTP" | quote }},
+              "RecordType": {
+                  "HTTP": "all",
+                  "TCP": "all",
+                  "SWG": "all",
+                  "VPN": "all",
+                  "NGS": "all",
+                  "ICA": "all",
+                  "APPFW": "none",
+                  "BOT": "none",
+                  "VIDEOOPT": "none",
+                  "BURST_CQA": "none",
+                  "SLA": "none",
+                  "MONGO": "none"
+              },
+              "ProcessAlways": "yes",
+              "FileSizeMax": "40",
+              "ProcessYieldTimeOut": "500",
+              "FileStorageLimit": "1000",
+              "SkipAvro": "no",
+              "AvroCompress": "yes"
+          }{{- if .Values.ns_tracing.enabled }},{{- end}}
 {{- else if .Values.elasticsearch.enabled }}
-       "RecordType": {
-            "HTTP": "all",
-            "TCP": "all",
-            "SWG": "all",
-            "VPN": "all",
-            "NGS": "all",
-            "ICA": "all",
-            "APPFW": "all",
-            "BOT": "none",
-            "VIDEOOPT": "none",
-            "BURST_CQA": "none",
-            "SLA": "none"
-        },
-{{- if .Values.ns_tracing.enabled }}
-       "EnableTracing": "yes",
-       "TracingServer": {{ .Values.ns_tracing.server | default "zipkin:9411/api/v1/spans" | quote }},
+          "ES": {
+              "ServerUrl": {{ .Values.elasticsearch.server | default "elasticsearch:9200" | quote }},
+              "IndexPrefix":"adc_coe",
+              "IndexInterval": "daily",
+              "RecordType": {
+                  "HTTP": "all",
+                  "TCP": "all",
+                  "SWG": "all",
+                  "VPN": "all",
+                  "NGS": "all",
+                  "ICA": "all",
+                  "APPFW": "none",
+                  "BOT": "none",
+                  "VIDEOOPT": "none",
+                  "BURST_CQA": "none",
+                  "SLA": "none",
+                  "MONGO": "none"
+              },
+              "ProcessAlways": "no",
+              "ProcessYieldTimeOut": "500",
+              "MaxConnections": "512",
+              "ElkMaxSendBuffersPerSec": "64",
+              "JsonFileDump": "no"
+            }{{- if .Values.ns_tracing.enabled }},{{- end}}
+
 {{- end}}
-       "ProcessAlways": "no",
-       "ProcessorMode": "json",
-       "ElkServer": {{ .Values.elasticsearch.server | default "elasticsearch:9200" | quote }},
-       "ElkMaxConnections": "512",
-       "ElkMaxSendBuffersPerSec": "128",
-       "ElkBufferingLimit": "1024*1024",
-       "ELKFileDump": "no",
-       "ProcessYieldTimeOut": "500"
-{{- else if .Values.ns_tracing.enabled }}
-        "RecordType": {
-            "HTTP": "all",
-            "TCP": "all",
-            "SWG": "all",
-            "VPN": "none",
-            "NGS": "none",
-            "ICA": "none",
-            "APPFW": "none",
-            "BOT": "none",
-            "VIDEOOPT": "none",
-            "BURST_CQA": "none",
-            "SLA": "none"
-        },
-        "EnableTracing": "yes",
-        "TracingServer": {{ .Values.ns_tracing.server | default "zipkin:9411/api/v1/spans" | quote }},
-        "ProcessAlways": "yes",
-        "ProcessorMode": "avro",
-        "SkipAvro": "yes",
-        "FileSizeMax": "40",
-        "ProcessYieldTimeOut": "500",
-        "FileStorageLimit": "1000"
+{{- if .Values.ns_tracing.enabled }}
+          "ZIPKIN": {
+            "ServerUrl": {{ .Values.ns_tracing.server  | default "zipkin:9411/api/v1/spans" | quote }},
+            "RecordType": {
+                "HTTP": "all",
+                "TCP": "all",
+                "SWG": "all"
+            },
+            "ProcessAlways": "yes",
+            "ProcessorMode": "avro",
+            "SkipAvro": "yes",
+            "FileSizeMax": "40",
+            "ProcessYieldTimeOut": "500"
+          }
 {{- end}}
+        }
     }
+
diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml
@@ -24,6 +24,8 @@ spec:
         - name: coe
           image: {{ .Values.image }} 
           imagePullPolicy: {{ .Values.pullPolicy }}
+          securityContext:
+            privileged: true
           ports:
             - containerPort: 5557
               name: lstream
@@ -35,7 +37,12 @@ spec:
             - name: lstreamd-config
               mountPath: /var/logproxy/lstreamd/conf/lstreamd_default.conf
               subPath: lstreamd_default.conf
+            - name: core-data
+              mountPath: /cores/
       volumes:
         - name: lstreamd-config
           configMap:
-            name: coe-config 
+            name: coe-config
+        - name: core-data
+          emptyDir: {}
+
diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/service.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/service.yaml
@@ -40,3 +40,4 @@ spec:
 {{- end}}
   selector: 
       app: coe
+
diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/values.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/values.yaml
@@ -1,8 +1,8 @@
-# Default values for citrix-logproxy
+# Default values for Citrix Observability Exporter
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image: "quay.io/citrix/citrix-observability-exporter:1.1.001"
+image: "quay.io/citrix/citrix-observability-exporter:1.2.001"
 pullPolicy: IfNotPresent
 replicas: 1
 # license is used accept the terms of the Citrix license

diff --git a/citrix-observability-exporter/Chart.yaml b/citrix-observability-exporter/Chart.yaml
@@ -1,12 +1,15 @@
 apiVersion: v2
-appVersion: "1.1.001"
+appVersion: "1.2.001"
 description: A Helm chart for Citrix Observability Exporter
 name: citrix-observability-exporter
-version: 1.1.001
+version: 1.2.001
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png 
 home: https://www.citrix.com
 sources:
 - https://github.com/citrix/citrix-observability-exporter
 maintainers:
 - name: SathiyaCV
   email: sathiya.viswanathan@citrix.com
+- name: NagarajHarikar
+  email: nagarajb.harikar@citrix.com
+
diff --git a/citrix-observability-exporter/templates/configmap.yaml b/citrix-observability-exporter/templates/configmap.yaml
@@ -5,80 +5,74 @@ metadata:
 data:
   lstreamd_default.conf: |
     {
+        "Endpoints": {
 {{- if .Values.kafka.enabled }}
-        "RecordType": {
-            "HTTP": "all",
-            "TCP": "all",
-            "SWG": "all",
-            "VPN": "all",
-            "NGS": "all",
-            "ICA": "all",
-            "APPFW": "none",
-            "BOT": "none",
-            "VIDEOOPT": "none",
-            "BURST_CQA": "none",
-            "SLA": "none"
-        },
-{{- if .Values.ns_tracing.enabled }}
-        "EnableTracing": "yes",
-        "TracingServer": {{ .Values.ns_tracing.server  | default "zipkin:9411/api/v1/spans" | quote }},
-{{- end}}
-        "ProcessAlways": "yes",
-        "ProcessorMode": "avro",
-        "FileSizeMax": "40",
-        "SkipAvro": "no",
-        "EnableKafka": "yes",
-        "KafkaBroker": {{ .Values.kafka.broker | quote }},
-        "KafkaTopic": {{ .Values.kafka.topic  | default "HTTP" | quote }},
-        "ProcessYieldTimeOut": "500",
-        "FileStorageLimit": "1000"
+          "KAFKA": {
+              "ServerUrl": {{ .Values.kafka.broker | quote }},
+              "KafkaTopic": {{ .Values.kafka.topic  | default "HTTP" | quote }},
+              "RecordType": {
+                  "HTTP": "all",
+                  "TCP": "all",
+                  "SWG": "all",
+                  "VPN": "all",
+                  "NGS": "all",
+                  "ICA": "all",
+                  "APPFW": "none",
+                  "BOT": "none",
+                  "VIDEOOPT": "none",
+                  "BURST_CQA": "none",
+                  "SLA": "none",
+                  "MONGO": "none"
+              },
+              "ProcessAlways": "yes",
+              "FileSizeMax": "40",
+              "ProcessYieldTimeOut": "500",
+              "FileStorageLimit": "1000",
+              "SkipAvro": "no",
+              "AvroCompress": "yes"
+          }{{- if .Values.ns_tracing.enabled }},{{- end}}
 {{- else if .Values.elasticsearch.enabled }}
-       "RecordType": {
-            "HTTP": "all",
-            "TCP": "all",
-            "SWG": "all",
-            "VPN": "all",
-            "NGS": "all",
-            "ICA": "all",
-            "APPFW": "all",
-            "BOT": "none",
-            "VIDEOOPT": "none",
-            "BURST_CQA": "none",
-            "SLA": "none"
-        },
-{{- if .Values.ns_tracing.enabled }}
-       "EnableTracing": "yes",
-       "TracingServer": {{ .Values.ns_tracing.server | default "zipkin:9411/api/v1/spans" | quote }},
+          "ES": {
+              "ServerUrl": {{ .Values.elasticsearch.server | default "elasticsearch:9200" | quote }},
+              "IndexPrefix":"adc_coe",
+              "IndexInterval": "daily",
+              "RecordType": {
+                  "HTTP": "all",
+                  "TCP": "all",
+                  "SWG": "all",
+                  "VPN": "all",
+                  "NGS": "all",
+                  "ICA": "all",
+                  "APPFW": "none",
+                  "BOT": "none",
+                  "VIDEOOPT": "none",
+                  "BURST_CQA": "none",
+                  "SLA": "none",
+                  "MONGO": "none"
+              },
+              "ProcessAlways": "no",
+              "ProcessYieldTimeOut": "500",
+              "MaxConnections": "512",
+              "ElkMaxSendBuffersPerSec": "64",
+              "JsonFileDump": "no"
+            }{{- if .Values.ns_tracing.enabled }},{{- end}}
+
 {{- end}}
-       "ProcessAlways": "no",
-       "ProcessorMode": "json",
-       "ElkServer": {{ .Values.elasticsearch.server | default "elasticsearch:9200" | quote }},
-       "ElkMaxConnections": "512",
-       "ElkMaxSendBuffersPerSec": "128",
-       "ElkBufferingLimit": "1024*1024",
-       "ELKFileDump": "no",
-       "ProcessYieldTimeOut": "500"
-{{- else if .Values.ns_tracing.enabled }}
-        "RecordType": {
-            "HTTP": "all",
-            "TCP": "all",
-            "SWG": "all",
-            "VPN": "none",
-            "NGS": "none",
-            "ICA": "none",
-            "APPFW": "none",
-            "BOT": "none",
-            "VIDEOOPT": "none",
-            "BURST_CQA": "none",
-            "SLA": "none"
-        },
-        "EnableTracing": "yes",
-        "TracingServer": {{ .Values.ns_tracing.server | default "zipkin:9411/api/v1/spans" | quote }},
-        "ProcessAlways": "yes",
-        "ProcessorMode": "avro",
-        "SkipAvro": "yes",
-        "FileSizeMax": "40",
-        "ProcessYieldTimeOut": "500",
-        "FileStorageLimit": "1000"
+{{- if .Values.ns_tracing.enabled }}
+          "ZIPKIN": {
+            "ServerUrl": {{ .Values.ns_tracing.server  | default "zipkin:9411/api/v1/spans" | quote }},
+            "RecordType": {
+                "HTTP": "all",
+                "TCP": "all",
+                "SWG": "all"
+            },
+            "ProcessAlways": "yes",
+            "ProcessorMode": "avro",
+            "SkipAvro": "yes",
+            "FileSizeMax": "40",
+            "ProcessYieldTimeOut": "500"
+          }
 {{- end}}
+        }
     }
+