From 4a4a2ec1a6fdfbe35cbdcae75c7c09e40cf5bde1 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Fri, 29 Nov 2024 09:42:31 +0300
Subject: [PATCH] import grafana-pcp-5.2.2-1.el10

---
 .gitignore                                       |  6 +++---
 .grafana-pcp.metadata                            |  6 +++---
 SOURCES/0001-remove-unused-frontend-crypto.patch | 10 +++++-----
 SPECS/grafana-pcp.spec                           |  9 ++++++---
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 591b1bf..d8d040f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-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
+SOURCES/grafana-pcp-5.2.2.tar.gz
+SOURCES/grafana-pcp-vendor-5.2.2-1.tar.xz
+SOURCES/grafana-pcp-webpack-5.2.2-1.tar.gz
diff --git a/.grafana-pcp.metadata b/.grafana-pcp.metadata
index 919dde6..423e05a 100644
--- a/.grafana-pcp.metadata
+++ b/.grafana-pcp.metadata
@@ -1,3 +1,3 @@
-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
+56170911f29a83a47b4f404f473dc7884c8310b5 SOURCES/grafana-pcp-5.2.2.tar.gz
+c16f7729d850844416ebae116d66d1cf5f43ca20 SOURCES/grafana-pcp-vendor-5.2.2-1.tar.xz
+f54bd006bbaf016954d69c6d23e8aa6a01792d27 SOURCES/grafana-pcp-webpack-5.2.2-1.tar.gz
diff --git a/SOURCES/0001-remove-unused-frontend-crypto.patch b/SOURCES/0001-remove-unused-frontend-crypto.patch
index aec3118..ff09e34 100644
--- a/SOURCES/0001-remove-unused-frontend-crypto.patch
+++ b/SOURCES/0001-remove-unused-frontend-crypto.patch
@@ -1,4 +1,4 @@
-From 42efb49249abc889ad006b3b6f1b16547eed4fbb Mon Sep 17 00:00:00 2001
+From e8db8e1d940d41ae46d9db41e4bd4d304b39b589 Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Thu, 7 Jul 2022 15:38:28 +0200
 Subject: [PATCH] remove unused frontend crypto
@@ -7,10 +7,10 @@ update `package.json` and then run `yarn install` to update the
 `yarn.lock` lockfile
 
 diff --git a/package.json b/package.json
-index dd46cd2..a635c38 100644
+index deb0f84..6515d9c 100644
 --- a/package.json
 +++ b/package.json
-@@ -88,7 +88,9 @@
+@@ -89,7 +89,9 @@
      "path-to-regexp": "^1.9.0",
      "uplot": "^1.6.31",
      "@sentry/browser": "^7.119.1",
@@ -22,7 +22,7 @@ index dd46cd2..a635c38 100644
    "engines": {
      "node": ">=14"
 diff --git a/yarn.lock b/yarn.lock
-index 87f346c..16202b0 100644
+index 757627a..3fc50ac 100644
 --- a/yarn.lock
 +++ b/yarn.lock
 @@ -4156,18 +4156,6 @@ array.prototype.flatmap@^1.2.5:
@@ -70,7 +70,7 @@ index 87f346c..16202b0 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:
+@@ -5007,6 +4983,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"
  
diff --git a/SPECS/grafana-pcp.spec b/SPECS/grafana-pcp.spec
index d0d198b..f8927cd 100644
--- a/SPECS/grafana-pcp.spec
+++ b/SPECS/grafana-pcp.spec
@@ -15,7 +15,7 @@ end}
 %global gomodulesmode GO111MODULE=auto
 
 Name:           grafana-pcp
-Version:        5.2.1
+Version:        5.2.2
 Release:        1%{?dist}
 Summary:        Performance Co-Pilot Grafana Plugin
 License:        Apache-2.0
@@ -124,7 +124,7 @@ Provides: bundled(npm(utility-types)) = 3.10.0
 
 %description
 This Grafana plugin for Performance Co-Pilot includes data sources for
-scalable time series from pmseries(1) and Redis, live PCP metrics and
+scalable time series from pmseries(1) and Valkey, live PCP metrics and
 bpftrace scripts from pmdabpftrace(1), as well as several dashboards.
 
 %prep
@@ -144,7 +144,7 @@ bpftrace scripts from pmdabpftrace(1), as well as several dashboards.
 %endif
 
 # Build backend data source
-%gobuild -o dist/datasources/redis/pcp_redis_datasource_$(go env GOOS)_$(go env GOARCH) ./pkg
+%gobuild -o dist/datasources/valkey/pcp_valkey_datasource_$(go env GOOS)_$(go env GOARCH) ./pkg
 
 
 %install
@@ -194,6 +194,9 @@ yarn test
 
 
 %changelog
+* Tue Nov 26 2024 Sam Feifer <sfeifer@redhat.com> - 5.2.2-1
+- Resolves RHEL-67043: update to 5.2.2 tagged upstream community sources, see CHANGELOG
+
 * Mon Nov 11 2024 Sam Feifer <sfeifer@redhat.com> - 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