From 42e697935ae4d3ba7c31fe339e4389ce5df759e2 Mon Sep 17 00:00:00 2001
From: Ben Harosh <benha@jfrog.com>
Date: Thu, 7 Nov 2024 14:54:43 -0800
Subject: [PATCH] PTRENG-6513 - Upgrade FluentD sidecar version to 4.13

---
 .github/workflows/pipeline_request.yml | 16 ----------------
 CHANGELOG.md                           |  4 ++++
 helm/artifactory-ha-values.yaml        |  2 +-
 helm/artifactory-values.yaml           |  2 +-
 helm/xray-values.yaml                  |  2 +-
 5 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 .github/workflows/pipeline_request.yml

diff --git a/.github/workflows/pipeline_request.yml b/.github/workflows/pipeline_request.yml
deleted file mode 100644
index 8ec6286..0000000
--- a/.github/workflows/pipeline_request.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-on:
-  pull_request:
-    branches:
-      - master
-    types: [opened, reopened]
-name: Pull Request Automation
-jobs:
-  deployment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy Stage
-        uses: fjogeleit/http-request-action@master
-        with:
-          url: "https://${{ secrets.PARTNERSHIP_USER }}:${{ secrets.PARTNERSHIP_API_KEY }}@partnership-pipelines-api.jfrog.io/v1/projectIntegrations/356/hook"
-          data: '{"branch":"${{ github.head_ref }}", "prurl":"${{ github.event.pull_request.html_url }}", "prtitle":"${{ github.event.pull_request.title }}", "prnumber":"${{ github.event.pull_request.number }}"}'
-          method: 'POST'
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c43dffb..912a64a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to the log analytics integration will be documented in this file.
 
+## [1.0.8] - November 7, 2024
+
+* FluentD sidecar image version bumped to 4.13, to reflect changes in `jfrog_siem` and `jfrog_send_metrics` FluentD plugins 
+
 ## [1.0.7] - October 25, 2024
 
 * Add support for metrics and logs outbound payload compression, with `gzip_compression` FluentD param as part of `fluent-plugin-jfrog-sent-metrics` and `fluent-plugin-splunk-hec` plugins
diff --git a/helm/artifactory-ha-values.yaml b/helm/artifactory-ha-values.yaml
index c743642..61ea79f 100644
--- a/helm/artifactory-ha-values.yaml
+++ b/helm/artifactory-ha-values.yaml
@@ -18,7 +18,7 @@ artifactory:
           name: volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.9"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.13"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
diff --git a/helm/artifactory-values.yaml b/helm/artifactory-values.yaml
index 3be98a0..3dd24f3 100644
--- a/helm/artifactory-values.yaml
+++ b/helm/artifactory-values.yaml
@@ -18,7 +18,7 @@ artifactory:
           name: artifactory-volume
   customSidecarContainers: |
     - name: "artifactory-fluentd-sidecar"
-      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.9"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.13"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.artifactory.persistence.mountPath }}"
diff --git a/helm/xray-values.yaml b/helm/xray-values.yaml
index 7c8598d..8b1dea9 100644
--- 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.9"
+      image: "releases-pts-observability-fluentd.jfrog.io/fluentd:4.13"
       imagePullPolicy: "IfNotPresent"
       volumeMounts:
         - mountPath: "{{ .Values.xray.persistence.mountPath }}"