Merge pull request #82 from splunk/helm-defaults-fix

fix: 🐛 pull fabric logger defaults into helm template
splunk · Apr 15, 2021 · a7654e7 · a7654e7
2 parents f5c8a28 + daf2e2b
commit a7654e7
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -149,6 +149,7 @@ Make sure that the peer credentials are stored in the appropriately named secret
 A `network.yaml` configmap will automatically be generated using the secrets and channel details set above. You can deploy via helm:
 
     helm install -n fabric-logger-${PEER_NAME}-${NS} --namespace ${NS} \
+                 -f https://raw.githubusercontent.com/splunk/fabric-logger/master/defaults.fabriclogger.yaml \
                  -f values.yaml -f network.yaml \
                  https://github.com/splunk/fabric-logger/releases/download/v4.2.1/fabric-logger-helm-4.2.1.tgz
 

diff --git a/helm-chart/fabric-logger/templates/configmap.yaml b/helm-chart/fabric-logger/templates/configmap.yaml
@@ -55,3 +55,57 @@ data:
         - channelName: {{ .channelName }}
           chaincodeId: {{ .chaincodeId }}
         {{- end }}
+    {{- if .Values.output }}
+    output:
+      type: {{ .Values.output.type }}
+      sourceTypePrefix: {{ .Values.output.sourceTypePrefix | quote }}
+      sourcetypes:
+        {{- range $key, $value:= .Values.output.sourcetypes }}
+        {{ $key }}: {{ . | quote }}
+        {{- end}}
+    {{- end }}
+    {{- if .Values.prometheus }}
+    prometheus:
+      discovery: {{ .Values.prometheus.discovery }}
+      validateCertificate: {{ .Values.prometheus.validateCertificate }}
+      port: {{ .Values.prometheus.port | quote }}
+      path: {{ .Values.prometheus.path | quote }}
+    {{- end }}
+    {{- if .Values.checkpoint }}
+    checkpoint:
+      filename: {{ .Values.checkpoint.filename | quote }}
+      saveInterval: {{ .Values.checkpoint.saveInterval }}
+    {{- end }}
+    {{- if .Values.hec }}
+    hec:
+      default:
+        defaultMetadata:
+          {{- range $key, $value:= .Values.hec.default.defaultMetadata }}
+          {{ $key }}: {{ . }}
+          {{- end}}
+        flushTime: {{ .Values.hec.default.flushTime }}
+        maxQueueEntries: {{ .Values.hec.default.maxQueueEntries }}
+        maxQueueSize: {{ .Values.hec.default.maxQueueSize }}
+        gzip: {{ .Values.hec.default.gzip }}
+        timeout: {{ .Values.hec.default.timeout }}
+        requestKeepAlive: {{ .Values.hec.default.requestKeepAlive }}
+        validateCertificate: {{ .Values.hec.default.validateCertificate }}
+        maxSockets: {{ .Values.hec.default.maxSockets }}
+        userAgent: {{ .Values.hec.default.userAgent }}
+        multipleMetricFormatEnabled: {{ .Values.hec.default.multipleMetricFormatEnabled }}
+        waitForAvailability: {{ .Values.hec.default.waitForAvailability }}
+        retryWaitTime:
+          {{- range $key, $value:= .Values.hec.default.retryWaitTime }}
+          {{ $key }}: {{ . }}
+          {{- end}}
+      internal:
+        flushTime: {{ .Values.hec.internal.flushTime }}
+        defaultMetadata:
+          {{- range $key, $value:= .Values.hec.internal.defaultMetadata }}
+          {{ $key }}: {{ . }}
+          {{- end}}
+        defaultFields:
+          {{- range $key, $value:= .Values.hec.internal.defaultFields }}
+          {{ $key }}: {{ . }}
+          {{- end}}
+    {{- end }}