Merge pull request #69 from jfrog/JOBS-760

JOBS-760 - Fix ha-values yaml and upgrade params

Author: benharosh

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All changes to the log analytics integration will be documented in this file.
 
+## [1.0.12] - March 18, 2025
+
+* FluentD sidecar image version bumped to 4.15, to upgrade base image to bitnami/fluentd 1.18
+* Update artifactory-ha helm values file
+* Readme minor updates
+
 ## [1.0.11] - August 27, 2024
 
 * Update kubernetes services and service moniotors definitions to align with new metrics API changes in Artifactory and Xray

README.md

@@ -23,7 +23,7 @@ The JFrog Log Analytics and Metrics solution using Prometheus consists of three
    1. For Installation and usage refer [HELM Guide](https://helm.sh/docs/intro/install/)
 4. Versions supported and Tested:
 
-   Artifactory: 7.90.8
+   Artifactory: 7.104.7 
 
    Xray: 3.103.6
 

helm/artifactory-ha-values.yaml

@@ -11,7 +11,7 @@ artifactory:
     enabled: true
   customInitContainersBegin: |
     - name: "prepare-fluentd-conf-on-persistent-volume"
-      image: {{ include "artifactory.getImageInfoByValue" (list . "initContainers") }}
+      image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
       imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
       command:
         - 'sh'
@@ -24,7 +24,7 @@ artifactory:
           name: volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.15"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"

helm/artifactory-values.yaml

@@ -24,7 +24,7 @@ artifactory:
           name: artifactory-volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.15"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"

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.5"
+        image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.15"
         imagePullPolicy: "IfNotPresent"
         volumeMounts:
           - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"

helm/xray-values.yaml

@@ -37,7 +37,7 @@ common:
           name: data-volume
   customSidecarContainers: |
     - name: "xray-platform-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.5"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.15"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.xray.persistence.mountPath }}"