PTRENG-6186 - Fix metrics documentation + upgrade fluentd to 1.17.0

jfrog · Jul 22, 2024 · 5769b09 · 5769b09
1 parent ce3becc
commit 5769b09
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 133 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All changes to the log analytics integration will be documented in this file.
 
+## [1.0.5] - July 22, 2024
+* FluentD sidecar version bumped to 4.5, to upgrade base image to bitnami/fluentd 1.17.0
+* Fixing metrics documentation and general readme fixes
+* Remove elastic search fluentd plugins from docker images
+
 ## [1.0.4] - June6, 2024
 * [BREAKING] Adding deprecation notice for partnership-pts-observability.jfrog.io docker registry
 * FluentD sidecar version bumped to 4.3, to upgrade base image to bitnami/fluentd 1.16.5

diff --git a/README.md b/README.md
diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile for bitnami/fluentd sidecar image with all the necessary plugins for our log analytic providers
-FROM bitnami/fluentd:1.16.3
+FROM bitnami/fluentd:1.17.0
 LABEL maintainer="Partner Engineering <[email protected]>"
 
 ## Build time Arguments, short circuit them to ENV Variables so they are available at run time also

diff --git a/fluentd-installer/Dockerfile.fluentd.sidecar b/fluentd-installer/Dockerfile.fluentd.sidecar
@@ -1,18 +1,13 @@
 # Dockerfile for bitnami/fluentd sidecar image with all the necessary plugins for our log analytic providers
-FROM bitnami/fluentd:1.16.3
+FROM bitnami/fluentd:1.17.0
 LABEL maintainer "Partner Engineering <[email protected]>"
 
 USER root
 
-##Uninstall elastic plugin which is preinstalled in bitnami fluentd
-##Pin elastic gem version to 7.14
-RUN fluent-gem uninstall elasticsearch -a --ignore-dependencies \
-  && fluent-gem install elasticsearch -v 7.14 --no-document \
-  ## Install custom Fluentd plugins
-  && fluent-gem install fluent-plugin-jfrog-siem --no-document \
+## Install custom Fluentd plugins
+RUN fluent-gem install fluent-plugin-jfrog-siem --no-document \
   && fluent-gem install fluent-plugin-splunk-hec --no-document \
   && fluent-gem install fluent-plugin-datadog --no-document \
-  && fluent-gem install fluent-plugin-elasticsearch --no-document \
   && fluent-gem install fluent-plugin-record-modifier --no-document \
   && fluent-gem install fluent-plugin-jfrog-metrics --no-document \
   && fluent-gem install fluent-plugin-jfrog-send-metrics --no-document \

diff --git a/helm/artifactory-ha-values.yaml b/helm/artifactory-ha-values.yaml
@@ -15,7 +15,7 @@ artifactory:
           name: volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.3"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
@@ -47,7 +47,7 @@ artifactory:
         - name: SPLUNK_INSECURE_SSL
           value: {{ .Values.splunk.insecure_ssl | quote}}
         - name: FLUENTD_CONF
-          value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
+          value: ../../../..{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
 splunk:
   host: SPLUNK_HEC_HOST
   port: SPLUNK_HEC_PORT

diff --git a/helm/artifactory-values.yaml b/helm/artifactory-values.yaml
@@ -15,7 +15,7 @@ artifactory:
           name: artifactory-volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.3"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
@@ -47,7 +47,7 @@ artifactory:
         - name: SPLUNK_INSECURE_SSL
           value: {{ .Values.splunk.insecure_ssl | quote}}
         - name: FLUENTD_CONF
-          value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
+          value: ../../../..{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
 splunk:
   host: SPLUNK_HEC_HOST
   port: SPLUNK_HEC_PORT

diff --git a/helm/xray-values.yaml b/helm/xray-values.yaml
@@ -19,7 +19,7 @@ common:
           name: data-volume
   customSidecarContainers: |
     - name: "xray-platform-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.3"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.xray.persistence.mountPath }}"
@@ -28,7 +28,7 @@ common:
         - name: JF_PRODUCT_DATA_INTERNAL
           value: {{ .Values.xray.persistence.mountPath }}
         - name: FLUENTD_CONF
-          value: ../../../../{{ .Values.xray.persistence.mountPath }}/etc/fluentd/fluentd.conf
+          value: ../../../..{{ .Values.xray.persistence.mountPath }}/etc/fluentd/fluentd.conf
         - name: JPD_URL
           value: {{ .Values.jfrog.observability.jpd_url }}
         - name: JPD_ADMIN_USERNAME