From b992f674bf8e6e3012805fc7bb2e16fe67870990 Mon Sep 17 00:00:00 2001 From: nagarajbh Date: Thu, 1 Oct 2020 13:20:43 +0530 Subject: [PATCH 1/3] COE configmap update for releae 1.2.001 --- citrix-cloud-native/Chart.yaml | 2 +- .../citrix-observability-exporter/Chart.yaml | 6 +- .../templates/configmap.yaml | 139 +++++++++--------- .../templates/deployment.yaml | 8 +- .../citrix-observability-exporter/values.yaml | 4 +- citrix-observability-exporter/Chart.yaml | 6 +- .../templates/configmap.yaml | 139 +++++++++--------- .../templates/deployment.yaml | 8 +- citrix-observability-exporter/values.yaml | 4 +- 9 files changed, 159 insertions(+), 157 deletions(-) diff --git a/citrix-cloud-native/Chart.yaml b/citrix-cloud-native/Chart.yaml index 84167786..5304c26b 100644 --- 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 index 8e901d74..6dbb4db8 100644 --- a/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml +++ b/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml @@ -1,8 +1,8 @@ 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: @@ -10,3 +10,5 @@ sources: maintainers: - name: SathiyaCV email: sathiya.viswanathan@citrix.com +- name: NagarajHarikar + email: nagarajb.harikar@citrix.com \ No newline at end of file diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml index c6bfa6c5..fc8867ea 100644 --- 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,73 @@ 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}} - } + } + } \ No newline at end of file diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml index 269be63e..3f128f48 100644 --- 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,11 @@ 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/values.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/values.yaml index 410d51a6..d9db24ca 100644 --- 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 index 8e901d74..5b7555a8 100644 --- a/citrix-observability-exporter/Chart.yaml +++ b/citrix-observability-exporter/Chart.yaml @@ -1,8 +1,8 @@ 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: @@ -10,3 +10,5 @@ sources: 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 index c6bfa6c5..fc8867ea 100644 --- a/citrix-observability-exporter/templates/configmap.yaml +++ b/citrix-observability-exporter/templates/configmap.yaml @@ -5,80 +5,73 @@ 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}} - } + } + } \ No newline at end of file diff --git a/citrix-observability-exporter/templates/deployment.yaml b/citrix-observability-exporter/templates/deployment.yaml index 269be63e..3f128f48 100644 --- a/citrix-observability-exporter/templates/deployment.yaml +++ b/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,11 @@ 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-observability-exporter/values.yaml b/citrix-observability-exporter/values.yaml index 410d51a6..d9db24ca 100644 --- a/citrix-observability-exporter/values.yaml +++ b/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 From 6baae2a657f64813c97e4cd0b4d269b6becdf2ac Mon Sep 17 00:00:00 2001 From: nagarajbh Date: Thu, 1 Oct 2020 13:30:04 +0530 Subject: [PATCH 2/3] newline at EOF --- .../citrix-observability-exporter/templates/configmap.yaml | 3 ++- .../citrix-observability-exporter/templates/deployment.yaml | 1 + .../citrix-observability-exporter/templates/service.yaml | 1 + citrix-observability-exporter/Chart.yaml | 1 + citrix-observability-exporter/templates/configmap.yaml | 3 ++- citrix-observability-exporter/templates/deployment.yaml | 1 + citrix-observability-exporter/templates/service.yaml | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml index fc8867ea..af72581d 100644 --- a/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml +++ b/citrix-cloud-native/charts/citrix-observability-exporter/templates/configmap.yaml @@ -74,4 +74,5 @@ data: } {{- end}} } - } \ No newline at end of file + } + diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml index 3f128f48..e1821dfd 100644 --- a/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml +++ b/citrix-cloud-native/charts/citrix-observability-exporter/templates/deployment.yaml @@ -45,3 +45,4 @@ spec: 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 index f0496b56..cc048240 100644 --- 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-observability-exporter/Chart.yaml b/citrix-observability-exporter/Chart.yaml index 5b7555a8..c0d01072 100644 --- a/citrix-observability-exporter/Chart.yaml +++ b/citrix-observability-exporter/Chart.yaml @@ -12,3 +12,4 @@ maintainers: 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 index fc8867ea..af72581d 100644 --- a/citrix-observability-exporter/templates/configmap.yaml +++ b/citrix-observability-exporter/templates/configmap.yaml @@ -74,4 +74,5 @@ data: } {{- end}} } - } \ No newline at end of file + } + diff --git a/citrix-observability-exporter/templates/deployment.yaml b/citrix-observability-exporter/templates/deployment.yaml index 3f128f48..e1821dfd 100644 --- a/citrix-observability-exporter/templates/deployment.yaml +++ b/citrix-observability-exporter/templates/deployment.yaml @@ -45,3 +45,4 @@ spec: name: coe-config - name: core-data emptyDir: {} + diff --git a/citrix-observability-exporter/templates/service.yaml b/citrix-observability-exporter/templates/service.yaml index f0496b56..cc048240 100644 --- a/citrix-observability-exporter/templates/service.yaml +++ b/citrix-observability-exporter/templates/service.yaml @@ -40,3 +40,4 @@ spec: {{- end}} selector: app: coe + From d20542ea22b823c03b26a09d07157965cc7524e0 Mon Sep 17 00:00:00 2001 From: nagarajbh Date: Thu, 1 Oct 2020 13:36:43 +0530 Subject: [PATCH 3/3] newline at EOF --- .../charts/citrix-observability-exporter/Chart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml b/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml index 6dbb4db8..c0d01072 100644 --- a/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml +++ b/citrix-cloud-native/charts/citrix-observability-exporter/Chart.yaml @@ -11,4 +11,5 @@ maintainers: - name: SathiyaCV email: sathiya.viswanathan@citrix.com - name: NagarajHarikar - email: nagarajb.harikar@citrix.com \ No newline at end of file + email: nagarajb.harikar@citrix.com +