From f85e2957d76e4861bfe293e44f3286706759a32d Mon Sep 17 00:00:00 2001 From: Sam Feifer Date: Tue, 8 Jul 2025 16:24:49 -0400 Subject: [PATCH] Resolves: RHEL-77946 --- 0001-remove-unused-frontend-crypto.patch | 50 ++++++++++++------------ 0002-remove-faulty-metric-tables.patch | 6 +++ 0003-fix-create_bundles-issue.patch | 20 ++++++++++ README.md | 4 +- create_bundles.sh | 2 + grafana-pcp.spec | 13 ++++-- sources | 6 +-- 7 files changed, 67 insertions(+), 34 deletions(-) create mode 100644 0003-fix-create_bundles-issue.patch diff --git a/0001-remove-unused-frontend-crypto.patch b/0001-remove-unused-frontend-crypto.patch index ff09e34..10c1d1a 100644 --- a/0001-remove-unused-frontend-crypto.patch +++ b/0001-remove-unused-frontend-crypto.patch @@ -1,4 +1,4 @@ -From e8db8e1d940d41ae46d9db41e4bd4d304b39b589 Mon Sep 17 00:00:00 2001 +From b55a27ced791fda5ca45e933a67a396aaf8136be Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Thu, 7 Jul 2022 15:38:28 +0200 Subject: [PATCH] remove unused frontend crypto @@ -7,25 +7,25 @@ update `package.json` and then run `yarn install` to update the `yarn.lock` lockfile diff --git a/package.json b/package.json -index deb0f84..6515d9c 100644 +index 7c16d2a..371e1b1 100644 --- a/package.json +++ b/package.json -@@ -89,7 +89,9 @@ - "path-to-regexp": "^1.9.0", - "uplot": "^1.6.31", - "@sentry/browser": "^7.119.1", -- "http-proxy-middleware": "^2.0.7" -+ "http-proxy-middleware": "^2.0.7", +@@ -93,7 +93,9 @@ + "nanoid": "^3.3.8", + "serialize-javascript": "^6.0.2", + "prismjs": "^1.30.0", +- "@babel/runtime": "^7.26.10" ++ "@babel/runtime": "^7.26.10", + "crypto-browserify": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.1.tgz", + "http-signature": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.1.tgz" }, "engines": { "node": ">=14" diff --git a/yarn.lock b/yarn.lock -index 757627a..3fc50ac 100644 +index 27dc315..1979673 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -4156,18 +4156,6 @@ array.prototype.flatmap@^1.2.5: +@@ -4147,18 +4147,6 @@ array.prototype.flatmap@^1.2.5: es-abstract "^1.19.2" es-shim-unscopables "^1.0.0" @@ -44,7 +44,7 @@ index 757627a..3fc50ac 100644 astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" -@@ -4412,13 +4400,6 @@ base64-js@^1.3.1: +@@ -4403,13 +4391,6 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -58,7 +58,7 @@ index 757627a..3fc50ac 100644 big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" -@@ -4956,11 +4937,6 @@ core-js@^3.6.5: +@@ -4947,11 +4928,6 @@ core-js@^3.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe" integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw== @@ -70,7 +70,7 @@ index 757627a..3fc50ac 100644 cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" -@@ -5007,6 +4983,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.5: +@@ -4998,6 +4974,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.5: shebang-command "^2.0.0" which "^2.0.1" @@ -81,7 +81,7 @@ index 757627a..3fc50ac 100644 css-animation@^1.3.2: version "1.6.1" resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.6.1.tgz#162064a3b0d51f958b7ff37b3d6d4de18e17039e" -@@ -5581,13 +5561,6 @@ d3@5.15.0: +@@ -5572,13 +5552,6 @@ d3@5.15.0: d3-voronoi "1" d3-zoom "1" @@ -95,7 +95,7 @@ index 757627a..3fc50ac 100644 data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" -@@ -5850,14 +5823,6 @@ duplexer@^0.1.2: +@@ -5841,14 +5814,6 @@ duplexer@^0.1.2: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== @@ -110,7 +110,7 @@ index 757627a..3fc50ac 100644 electron-to-chromium@^1.4.172: version "1.4.264" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.264.tgz#2f68a062c38b7a04bf57f3e6954b868672fbdcd3" -@@ -6494,16 +6459,6 @@ extract-zip@2.0.1: +@@ -6485,16 +6450,6 @@ extract-zip@2.0.1: optionalDependencies: "@types/yauzl" "^2.9.1" @@ -127,7 +127,7 @@ index 757627a..3fc50ac 100644 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" -@@ -6915,13 +6870,6 @@ getos@^3.2.1: +@@ -6906,13 +6861,6 @@ getos@^3.2.1: dependencies: async "^3.2.0" @@ -141,7 +141,7 @@ index 757627a..3fc50ac 100644 glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" -@@ -7211,15 +7159,6 @@ http-proxy@^1.18.1: +@@ -7202,15 +7150,6 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" @@ -157,7 +157,7 @@ index 757627a..3fc50ac 100644 https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" -@@ -8195,11 +8134,6 @@ js-yaml@^4.1.0: +@@ -8186,11 +8125,6 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" @@ -169,7 +169,7 @@ index 757627a..3fc50ac 100644 jsdoc-type-pratt-parser@~2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz#c9f93afac7ee4b5ed4432fe3f09f7d36b05ed0ff" -@@ -8268,11 +8202,6 @@ json-schema-traverse@^1.0.0: +@@ -8259,11 +8193,6 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== @@ -181,7 +181,7 @@ index 757627a..3fc50ac 100644 json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" -@@ -8302,16 +8231,6 @@ jsonfile@^6.0.1: +@@ -8293,16 +8222,6 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" @@ -198,7 +198,7 @@ index 757627a..3fc50ac 100644 "jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.3.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.1.tgz#a3e0f1cb7e230954eab4dcbce9f6288a78f8ba44" -@@ -10831,7 +10750,7 @@ safe-buffer@~5.1.1: +@@ -10822,7 +10741,7 @@ safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -207,7 +207,7 @@ index 757627a..3fc50ac 100644 version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -@@ -11233,21 +11152,6 @@ sprintf-js@~1.0.2: +@@ -11217,21 +11136,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== @@ -229,7 +229,7 @@ index 757627a..3fc50ac 100644 stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" -@@ -11717,11 +11621,6 @@ tunnel-agent@^0.6.0: +@@ -11701,11 +11605,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" @@ -241,7 +241,7 @@ index 757627a..3fc50ac 100644 type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" -@@ -11923,15 +11822,6 @@ value-equal@^1.0.1: +@@ -11907,15 +11806,6 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== diff --git a/0002-remove-faulty-metric-tables.patch b/0002-remove-faulty-metric-tables.patch index 942afe0..1d223c5 100644 --- a/0002-remove-faulty-metric-tables.patch +++ b/0002-remove-faulty-metric-tables.patch @@ -1,3 +1,9 @@ +From e3abd89f08e1e7f37184f9ce7ebe6f1d99ff2bbd Mon Sep 17 00:00:00 2001 +From: Sam Feifer +Date: Mon, 7 Jul 2025 10:16:54 -0400 +Subject: [PATCH] remove faulty metrics table + + diff --git a/src/datasources/vector/dashboards/pcp-vector-top-consumers.jsonnet b/src/datasources/vector/dashboards/pcp-vector-top-consumers.jsonnet index cef1a0e..c9f9f5d 100644 --- a/src/datasources/vector/dashboards/pcp-vector-top-consumers.jsonnet diff --git a/0003-fix-create_bundles-issue.patch b/0003-fix-create_bundles-issue.patch new file mode 100644 index 0000000..5ef2d00 --- /dev/null +++ b/0003-fix-create_bundles-issue.patch @@ -0,0 +1,20 @@ +From ec72306f807a299c1c647826aaa06aa2ef6c3c8b Mon Sep 17 00:00:00 2001 +From: Sam Feifer +Date: Mon, 7 Jul 2025 11:13:44 -0400 +Subject: [PATCH] fix create_bundles issue + + +diff --git a/go.mod b/go.mod +index e15218a..2f48814 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,8 +1,6 @@ + module github.com/performancecopilot/grafana-pcp + +-go 1.23.0 +- +-toolchain go1.24.2 ++go 1.23 + + require ( + github.com/grafana/grafana-plugin-sdk-go v0.250.0 diff --git a/README.md b/README.md index ba409c2..5a5193c 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ The grafana-pcp package * update specfile with contents of the `.manifest` file * run local build: `rpkg local` * run rpmlint: `rpmlint -r grafana-pcp.rpmlintrc /tmp/rpkg/grafana-pcp-*/grafana-pcp-*.src.rpm /tmp/rpkg/grafana-pcp-*/x86_64/grafana-pcp-*.x86_64.rpm` -* run a scratch build: `fedpkg scratch-build --srpm` -* upload new source tarballs: `fedpkg new-sources *.tar.gz *.tar.xz` +* run a scratch build: `centpkg scratch-build --srpm` +* upload new source tarballs: `centpkg new-sources *.tar.gz *.tar.xz` * commit new `sources` file ## Patches diff --git a/create_bundles.sh b/create_bundles.sh index 983835f..ebb10b8 100755 --- a/create_bundles.sh +++ b/create_bundles.sh @@ -19,6 +19,8 @@ tar xf "${SOURCE_TAR}" ## Create vendor bundle pushd "${SOURCE_DIR}" +patch -p1 --fuzz=0 < ../0003-fix-create_bundles-issue.patch + # Vendor Go dependencies go mod vendor diff --git a/grafana-pcp.spec b/grafana-pcp.spec index d57a77f..b728b7e 100644 --- a/grafana-pcp.spec +++ b/grafana-pcp.spec @@ -15,21 +15,21 @@ end} %global gomodulesmode GO111MODULE=auto Name: grafana-pcp -Version: 5.2.2 -Release: 3%{?dist} +Version: 5.3.0 +Release: 1%{?dist} Summary: Performance Co-Pilot Grafana Plugin License: Apache-2.0 URL: https://github.com/performancecopilot/grafana-pcp Source0: https://github.com/performancecopilot/grafana-pcp/archive/v%{version}/%{name}-%{version}.tar.gz -Source1: grafana-pcp-vendor-%{version}-2.tar.xz +Source1: grafana-pcp-vendor-%{version}-1.tar.xz # Note: In case there were no changes to this tarball, the NVR of this tarball # lags behind the NVR of this package. %if %{compile_frontend} == 0 # Source2 contains the precompiled frontend and dashboards # Note: In case there were no changes to this tarball, the NVR of this tarball # lags behind the NVR of this package. -Source2: grafana-pcp-webpack-%{version}-2.tar.gz +Source2: grafana-pcp-webpack-%{version}-1.tar.gz %endif Source3: create_bundles.sh Source4: build_frontend.sh @@ -38,6 +38,7 @@ Source6: create_bundles_in_container.sh Patch1: 0001-remove-unused-frontend-crypto.patch Patch2: 0002-remove-faulty-metric-tables.patch +Patch3: 0003-fix-create_bundles-issue.patch # Intersection of go_arches and nodejs_arches ExclusiveArch: %{grafanapcp_arches} @@ -137,6 +138,7 @@ bpftrace scripts from pmdabpftrace(1), as well as several dashboards. %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 %build @@ -196,6 +198,9 @@ yarn test %changelog +* Tue Jul 8 2025 Sam Feifer - 5.3.0-1 +- update to 5.3.0 tagged upstream sources, see CHANGELOG + * Tue Jun 10 2025 Sam Feifer - 5.2.2-3 - Resolves RHEL-89218: CVE-2025-22871 diff --git a/sources b/sources index a561563..eb45537 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (grafana-pcp-5.2.2.tar.gz) = c9df44356ed20d0ebccb8cebc98031a6d31e08e96058c13ce0051396733c27f2cee864e9692621b8074a13e7c2f6e7ef01476e656fa5c1aec01b7eb720498f03 -SHA512 (grafana-pcp-webpack-5.2.2-2.tar.gz) = a791e911b01a231e03548bc428cb4b91e334b77d2a5c47a3e96610bd148cf6e39e6f94d2bff3a890307b0831d7021efab61a6e414a1ea83b3c1d8c5d070c03a5 -SHA512 (grafana-pcp-vendor-5.2.2-2.tar.xz) = a958128f1d2e54e8ca073506dc804a288c4afa722c56c1d9eff8df8a8a9cb896b41de95c525dbc66099c9f4648933d5bfa60a41d57214d60b555909f9545390d +SHA512 (grafana-pcp-5.3.0.tar.gz) = d09e831277a532c51d51dcda9bd57228c65836f5092a4b3486e895116391c134ee9c9af55053617e225190fb4f929c02cef687decc0c6384a9f0ec9c7ad70804 +SHA512 (grafana-pcp-webpack-5.3.0-1.tar.gz) = a632996f8295fccdb3371110d777aedee3c4e27b5a92cf9833e27090e3acdf39793e772eab584e4089f00092af6629a1fc67ae2cc7b1ed37eaac502e3a4a5659 +SHA512 (grafana-pcp-vendor-5.3.0-1.tar.xz) = e2f1932d4a7ef3b71ad6ffe4cb4a0eba0183e9d2056b0e359f44c124d689c573bbba02ceefe206c2b07383203fab7698cb1a791401545519b1357cea275aed20