Merge pull request #66 from jfrog/PTRENG-6186

PTRENG-6186 - Fix metrics documentation and upgrade FluentD version
jfrog · Jul 22, 2024 · 0108956 · 0108956
2 parents 5e61e17 + 1c870c1
commit 0108956
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 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.9] - July 22, 2024
+
+* FluentD sidecar version bumped to 4.5, to upgrade base image to bitnami/fluentd 1.17.0
+* Fixing metrics documentation  
+
 ## [1.0.8] - June 7, 2024
 
 * [BREAKING] Adding deprecation notice for partnership-pts-observability.jfrog.io docker registry

diff --git a/README.md b/README.md
@@ -222,8 +222,6 @@ export RT_SERVICE_IP=$(kubectl get svc -n $INST_NAMESPACE artifactory-artifactor
 helm upgrade --install xray jfrog/xray --set xray.jfrogUrl=http://$RT_SERVICE_IP \
        --set xray.masterKey=$XRAY_MASTER_KEY \
        --set xray.joinKey=$JOIN_KEY \
-       --set xray.openMetrics.enabled=true \
-       --set xray.metrics.enabled=true \
        -f helm/xray-values.yaml \
        -n $INST_NAMESPACE
 ```

diff --git a/helm/artifactory-ha-values.yaml b/helm/artifactory-ha-values.yaml
@@ -23,7 +23,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 }}"
@@ -34,7 +34,7 @@ artifactory:
         - name: LOKI_URL
           value: http://loki.{{ .Release.Namespace }}:3100
         - name: FLUENTD_CONF
-          value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
+          value: ../../../..{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
 
 ## Allows to add additional kubernetes resources
 ## Use --- as a separator between multiple resources

diff --git a/helm/artifactory-values.yaml b/helm/artifactory-values.yaml
@@ -23,7 +23,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 }}"
@@ -34,7 +34,7 @@ artifactory:
         - name: LOKI_URL
           value: http://loki.{{ .Release.Namespace }}:3100
         - name: FLUENTD_CONF
-          value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
+          value: ../../../..{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
 ## Allows to add additional kubernetes resources
 ## Use --- as a separator between multiple resources
 ## For an example, refer - https://github.com/jfrog/log-analytics-prometheus

diff --git a/helm/jfrog-platform-values.yaml b/helm/jfrog-platform-values.yaml
@@ -25,7 +25,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 }}"
@@ -36,7 +36,7 @@ artifactory:
           - name: LOKI_URL
             value: http://loki.{{ .Release.Namespace }}:3100
           - name: FLUENTD_CONF
-            value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
+            value: ../../../..{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
   additionalResources: |
     apiVersion: v1
     kind: Service
@@ -106,7 +106,7 @@ xray:
             name: data-volume
     customSidecarContainers: |
       - name: "xray-platform-fluentd-sidecar"
-        image: "releases-pts-observability-fluentd.jfrog.io/fluentd:2.1"
+        image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
         imagePullPolicy: "IfNotPresent"
         volumeMounts:
           - mountPath: "{{ .Values.xray.persistence.mountPath }}"

diff --git a/helm/xray-values.yaml b/helm/xray-values.yaml
@@ -8,8 +8,6 @@ unifiedUpgradeAllowed: true
 databaseUpgradeReady: true
 xray:
   jfrogUrl: http://artifactory-artifactory.rt:8082
-  metrics:
-    enabled: true
   openMetrics:
     enabled: true
 replicaCount: 1
@@ -39,7 +37,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 }}"
@@ -48,7 +46,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: LOKI_URL
           value: http://loki.{{ .Release.Namespace }}:3100
 ## Allows to add additional kubernetes resources