From f49a6e58c480fa450829b98da8d8c38107498f10 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 27 Nov 2024 09:43:34 +0300 Subject: [PATCH] import grafana-pcp-5.2.1-1.el10 --- .gitignore | 6 +- .grafana-pcp.metadata | 6 +- .../0001-remove-unused-frontend-crypto.patch | 72 +++++++++---------- SPECS/grafana-pcp.spec | 14 ++-- 4 files changed, 51 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 9411df4..591b1bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/grafana-pcp-5.1.1.tar.gz -SOURCES/grafana-pcp-vendor-5.1.1-1.tar.xz -SOURCES/grafana-pcp-webpack-5.1.1-1.tar.gz +SOURCES/grafana-pcp-5.2.1.tar.gz +SOURCES/grafana-pcp-vendor-5.2.1-1.tar.xz +SOURCES/grafana-pcp-webpack-5.2.1-1.tar.gz diff --git a/.grafana-pcp.metadata b/.grafana-pcp.metadata index ad5f855..919dde6 100644 --- a/.grafana-pcp.metadata +++ b/.grafana-pcp.metadata @@ -1,3 +1,3 @@ -3b2c6875861e93eade0ab4321a49dfd6c692ca7a SOURCES/grafana-pcp-5.1.1.tar.gz -3eabf083226c04c7c5fa031d3b67d060cfc294f7 SOURCES/grafana-pcp-vendor-5.1.1-1.tar.xz -55fa447cbf8ffddc4ba5e50dc81b81e89f0f2fc7 SOURCES/grafana-pcp-webpack-5.1.1-1.tar.gz +879a4a046c0257615588f088bd1b5e19dbef6348 SOURCES/grafana-pcp-5.2.1.tar.gz +71024e9814353716ab1e7254b7609b712b9e7aca SOURCES/grafana-pcp-vendor-5.2.1-1.tar.xz +68ff5e8dde5b7d1ed4f43b66ebf8d107f343932d SOURCES/grafana-pcp-webpack-5.2.1-1.tar.gz diff --git a/SOURCES/0001-remove-unused-frontend-crypto.patch b/SOURCES/0001-remove-unused-frontend-crypto.patch index 0991d4b..aec3118 100644 --- a/SOURCES/0001-remove-unused-frontend-crypto.patch +++ b/SOURCES/0001-remove-unused-frontend-crypto.patch @@ -1,4 +1,4 @@ -From 7ed5650dc812fcbfcda7162845c4e6ea73a239a6 Mon Sep 17 00:00:00 2001 +From 42efb49249abc889ad006b3b6f1b16547eed4fbb 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 14c2960..db6858a 100644 +index dd46cd2..a635c38 100644 --- a/package.json +++ b/package.json -@@ -63,6 +63,10 @@ - "redux-persist": "^6.0.0", - "redux-thunk": "^2.3.0" - }, -+ "resolutions": { +@@ -88,7 +88,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", + "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 44bcec7..c2a86be 100644 +index 87f346c..16202b0 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -4067,18 +4067,6 @@ array.prototype.flatmap@^1.2.5: +@@ -4156,18 +4156,6 @@ array.prototype.flatmap@^1.2.5: es-abstract "^1.19.2" es-shim-unscopables "^1.0.0" @@ -44,7 +44,7 @@ index 44bcec7..c2a86be 100644 astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" -@@ -4321,13 +4309,6 @@ base64-js@^1.3.1: +@@ -4412,13 +4400,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 44bcec7..c2a86be 100644 big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" -@@ -4839,11 +4820,6 @@ core-js@^3.6.5: +@@ -4956,11 +4937,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,18 +70,18 @@ index 44bcec7..c2a86be 100644 cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" -@@ -4890,6 +4866,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +@@ -5007,6 +4983,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -+"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", http-signature@~1.3.6: ++"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", http-signature@~1.4.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.1.tgz#f8cae15d883ffc0abc663b5eaaa711fcc64bb5c2" + css-animation@^1.3.2: version "1.6.1" resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.6.1.tgz#162064a3b0d51f958b7ff37b3d6d4de18e17039e" -@@ -5469,13 +5449,6 @@ d3@5.15.0: +@@ -5581,13 +5561,6 @@ d3@5.15.0: d3-voronoi "1" d3-zoom "1" @@ -95,7 +95,7 @@ index 44bcec7..c2a86be 100644 data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" -@@ -5722,14 +5695,6 @@ duplexer@^0.1.2: +@@ -5850,14 +5823,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 44bcec7..c2a86be 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" -@@ -6336,16 +6301,6 @@ extract-zip@2.0.1: +@@ -6494,16 +6459,6 @@ extract-zip@2.0.1: optionalDependencies: "@types/yauzl" "^2.9.1" @@ -127,7 +127,7 @@ index 44bcec7..c2a86be 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" -@@ -6746,13 +6701,6 @@ getos@^3.2.1: +@@ -6915,13 +6870,6 @@ getos@^3.2.1: dependencies: async "^3.2.0" @@ -141,23 +141,23 @@ index 44bcec7..c2a86be 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" -@@ -7011,15 +6959,6 @@ http-proxy@^1.18.1: +@@ -7211,15 +7159,6 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" --http-signature@~1.3.6: -- version "1.3.6" -- resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9" -- integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw== +-http-signature@~1.4.0: +- version "1.4.0" +- resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f" +- integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg== - dependencies: - assert-plus "^1.0.0" - jsprim "^2.0.2" -- sshpk "^1.14.1" +- sshpk "^1.18.0" - 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" -@@ -7990,11 +7929,6 @@ js-yaml@^4.1.0: +@@ -8195,11 +8134,6 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" @@ -169,7 +169,7 @@ index 44bcec7..c2a86be 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" -@@ -8058,11 +7992,6 @@ json-schema-traverse@^1.0.0: +@@ -8268,11 +8202,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 44bcec7..c2a86be 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" -@@ -8092,16 +8021,6 @@ jsonfile@^6.0.1: +@@ -8302,16 +8231,6 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" @@ -198,7 +198,7 @@ index 44bcec7..c2a86be 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" -@@ -10611,7 +10530,7 @@ safe-buffer@~5.1.1: +@@ -10831,7 +10750,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,14 +207,14 @@ index 44bcec7..c2a86be 100644 version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -@@ -10989,21 +10908,6 @@ sprintf-js@~1.0.2: +@@ -11233,21 +11152,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== --sshpk@^1.14.1: -- version "1.17.0" -- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" -- integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== +-sshpk@^1.18.0: +- version "1.18.0" +- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028" +- integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" @@ -229,7 +229,7 @@ index 44bcec7..c2a86be 100644 stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" -@@ -11459,11 +11363,6 @@ tunnel-agent@^0.6.0: +@@ -11717,11 +11621,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" @@ -241,7 +241,7 @@ index 44bcec7..c2a86be 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" -@@ -11649,15 +11548,6 @@ value-equal@^1.0.1: +@@ -11923,15 +11822,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/SPECS/grafana-pcp.spec b/SPECS/grafana-pcp.spec index 5dd2735..260c408 100644 --- a/SPECS/grafana-pcp.spec +++ b/SPECS/grafana-pcp.spec @@ -15,8 +15,8 @@ end} %global gomodulesmode GO111MODULE=auto Name: grafana-pcp -Version: 5.1.1 -Release: 12%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: Performance Co-Pilot Grafana Plugin License: Apache-2.0 URL: https://github.com/performancecopilot/grafana-pcp @@ -75,9 +75,9 @@ Obsoletes: pcp-webapp-vector <= 4.3.4 # this is for security purposes, if nodejs-foo ever needs an update, # affected packages can be easily identified. # Note: generated by the Makefile (see README.md) -Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.141.0 -Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.4 -Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.0 +Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.250.0 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 1.0.2 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.9.0 Provides: bundled(npm(@babel/plugin-transform-modules-commonjs)) = 7.18.6 Provides: bundled(npm(@grafana/data)) = 9.1.6 Provides: bundled(npm(@grafana/runtime)) = 9.1.6 @@ -194,6 +194,10 @@ yarn test %changelog +* Mon Nov 11 2024 Sam Feifer - 5.2.1-1 +- Resolves RHEL-67043: update to 5.2.0/1 tagged upstream community sources, see CHANGELOG +- Resolves RHEL-16337: added PCP Vector Top Consumers dashboard in new release + * Tue Oct 29 2024 Troy Dawson - 5.1.1-12 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018