From 6f311cf46b7e69ebbdd016ab0af4e6ffcaa84c19 Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Mon, 31 Mar 2025 09:52:59 +0000 Subject: [PATCH 1/5] metric-collector-for-apache-cassandra-4.1/0.3.6 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- metric-collector-for-apache-cassandra-4.1.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metric-collector-for-apache-cassandra-4.1.yaml b/metric-collector-for-apache-cassandra-4.1.yaml index e2e9d5e2782..f9d1eb38d91 100644 --- a/metric-collector-for-apache-cassandra-4.1.yaml +++ b/metric-collector-for-apache-cassandra-4.1.yaml @@ -1,7 +1,7 @@ package: name: metric-collector-for-apache-cassandra-4.1 - version: 0.3.5 - epoch: 5 + version: "0.3.6" + epoch: 0 description: Drop-in metrics collection and dashboards for Apache Cassandra copyright: - license: Apache-2.0 @@ -29,7 +29,7 @@ pipeline: - uses: git-checkout with: repository: https://github.com/datastax/metric-collector-for-apache-cassandra - expected-commit: f97a258ea95d055c71f762c3725061f43678ae1f + expected-commit: 7b7bbf2d3081e80e5148711696cb1408e212fd48 tag: v${{package.version}} - uses: patch From 9649d1cf8f4211c6253945204c0c99464ddeab63 Mon Sep 17 00:00:00 2001 From: Vivian Rook Date: Tue, 1 Apr 2025 17:47:51 +0200 Subject: [PATCH 2/5] Removing patch as is fixed in upgrade GHSA-mjmj-j48q-9wg2 still seen. Noted in advisories Signed-off-by: Vivian Rook --- metric-collector-for-apache-cassandra-4.1.yaml | 4 ---- .../collectd-download-url-fix.patch | 17 ----------------- 2 files changed, 21 deletions(-) delete mode 100644 metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch diff --git a/metric-collector-for-apache-cassandra-4.1.yaml b/metric-collector-for-apache-cassandra-4.1.yaml index f9d1eb38d91..d95e0cbd2cd 100644 --- a/metric-collector-for-apache-cassandra-4.1.yaml +++ b/metric-collector-for-apache-cassandra-4.1.yaml @@ -32,10 +32,6 @@ pipeline: expected-commit: 7b7bbf2d3081e80e5148711696cb1408e212fd48 tag: v${{package.version}} - - uses: patch - with: - patches: collectd-download-url-fix.patch - # DO NOT bump snakeyaml to v2.0, as this version has breaking changes. This # needs to remain on v1.x - uses: maven/pombump diff --git a/metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch b/metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch deleted file mode 100644 index 98c9fc49a7b..00000000000 --- a/metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Upstream re-located one of their dependencies to another repository. They have -# fixed this in commit: 13922679209b9836554a292a68476aba41d1999c. However there -# have not been any new release tags cut as yet. As soon as there is a new -# release cut, this can be removed. -diff --git a/pom.xml b/pom.xml -index 25f2d82..7d2e30c 100755 ---- a/pom.xml -+++ b/pom.xml -@@ -192,7 +192,7 @@ - wget - - -- https://github.com/riptano/collectd/releases/download/v${collectd.version}/insights-collectd-${collectd.version}.tar.gz -+ https://github.com/datastax/collectd/releases/download/v${collectd.version}/insights-collectd-${collectd.version}.tar.gz - true - target - From 76da614dc91af9a58dcc24c5bbb2c5d9f9e2bc81 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 2 Apr 2025 11:34:26 -0400 Subject: [PATCH 3/5] metric-collector-for-apache-cassandra-4.1: switch to -jdk `-jre` doesn't have the `jar` command. --- metric-collector-for-apache-cassandra-4.1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metric-collector-for-apache-cassandra-4.1.yaml b/metric-collector-for-apache-cassandra-4.1.yaml index d95e0cbd2cd..792264c03f4 100644 --- a/metric-collector-for-apache-cassandra-4.1.yaml +++ b/metric-collector-for-apache-cassandra-4.1.yaml @@ -59,7 +59,7 @@ test: contents: packages: - bash - - openjdk-11-default-jvm + - openjdk-11-default-jdk pipeline: - name: Check JAR integrity runs: | From 9b0089d6e3658350d55a83a67a3be7c40c410da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 3 Apr 2025 12:02:05 +0200 Subject: [PATCH 4/5] Disable ldd-check for metric-collector-for-apache-cassandra-4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz 'sil2100' Zemczak --- metric-collector-for-apache-cassandra-4.1.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/metric-collector-for-apache-cassandra-4.1.yaml b/metric-collector-for-apache-cassandra-4.1.yaml index 792264c03f4..bbff330ab48 100644 --- a/metric-collector-for-apache-cassandra-4.1.yaml +++ b/metric-collector-for-apache-cassandra-4.1.yaml @@ -71,6 +71,8 @@ test: [ -d "/opt/metrics-collector/lib/collectd/usr/" ] || exit 1 # Will fail see https://github.com/wolfi-dev/os/issues/34356 # - uses: test/pkgconf - - uses: test/ldd-check - with: - packages: ${{package.name}} + # Will fail see https://github.com/wolfi-dev/os/issues/48193 + # We need to clean up this package, re-think the vendoring situation + # - uses: test/ldd-check + # with: + # packages: ${{package.name}} From da36d40217773ac57bbafd32f35ead097099ced4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 3 Apr 2025 12:33:43 +0200 Subject: [PATCH 5/5] Reorder tests to make lint happy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz 'sil2100' Zemczak --- metric-collector-for-apache-cassandra-4.1.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/metric-collector-for-apache-cassandra-4.1.yaml b/metric-collector-for-apache-cassandra-4.1.yaml index bbff330ab48..7fe07d32baa 100644 --- a/metric-collector-for-apache-cassandra-4.1.yaml +++ b/metric-collector-for-apache-cassandra-4.1.yaml @@ -61,6 +61,13 @@ test: - bash - openjdk-11-default-jdk pipeline: + # Will fail see https://github.com/wolfi-dev/os/issues/34356 + # - uses: test/pkgconf + # Will fail see https://github.com/wolfi-dev/os/issues/48193 + # We need to clean up this package, re-think the vendoring situation + # - uses: test/ldd-check + # with: + # packages: ${{package.name}} - name: Check JAR integrity runs: | jar tvf /opt/metrics-collector/lib/datastax-mcac-agent.jar > /dev/null 2>&1 @@ -69,10 +76,3 @@ test: [ -d "/opt/metrics-collector/lib/collectd/lib/" ] || exit 1 [ -d "/opt/metrics-collector/lib/collectd/etc/" ] || exit 1 [ -d "/opt/metrics-collector/lib/collectd/usr/" ] || exit 1 - # Will fail see https://github.com/wolfi-dev/os/issues/34356 - # - uses: test/pkgconf - # Will fail see https://github.com/wolfi-dev/os/issues/48193 - # We need to clean up this package, re-think the vendoring situation - # - uses: test/ldd-check - # with: - # packages: ${{package.name}}