From a1e7cdffb675bc350d4a22f6dc7b1689f350da4e Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 17 Nov 2021 15:28:20 +0800
Subject: [PATCH] Update Patch Source Provides

---
 001-wrappers-grafana-cli.patch                |   2 +-
 002-manpages.patch                            |  18 +-
 004-pin-yarn-version.patch                    |  13 -
 ...ch => 004-remove-unused-dependencies.patch |   0
 ...it.patch => 005-fix-gtime-test-32bit.patch |   0
 ...=> 006-remove-unused-frontend-crypto.patch |   0
 ...h => 007-patch-unused-backend-crypto.patch |   0
 007-skip-x86-goldenfiles-tests.patch          |  69 ------
 distro-defaults.ini                           |  84 ++++++-
 grafana.spec                                  | 231 +++++++++---------
 10 files changed, 206 insertions(+), 211 deletions(-)
 delete mode 100644 004-pin-yarn-version.patch
 rename 005-remove-unused-dependencies.patch => 004-remove-unused-dependencies.patch (100%)
 rename 006-fix-gtime-test-32bit.patch => 005-fix-gtime-test-32bit.patch (100%)
 rename 008-remove-unused-frontend-crypto.patch => 006-remove-unused-frontend-crypto.patch (100%)
 rename 009-patch-unused-backend-crypto.patch => 007-patch-unused-backend-crypto.patch (100%)
 delete mode 100644 007-skip-x86-goldenfiles-tests.patch

diff --git a/001-wrappers-grafana-cli.patch b/001-wrappers-grafana-cli.patch
index 722d61f..01fe90e 100644
--- a/001-wrappers-grafana-cli.patch
+++ b/001-wrappers-grafana-cli.patch
@@ -44,6 +44,6 @@ index 9cad151c0d..a786edc596 100755
 +  cd "${GRAFANA_HOME}"
 +  exec "$EXECUTABLE" "$OPTS" "$@"
 +else
-+  echo "Please run this script as user \"${GRAFANA_USER}\" or root."
++  echo "$0: please run this script as user \"${GRAFANA_USER}\" or root."
 +  exit 5
 +fi
diff --git a/002-manpages.patch b/002-manpages.patch
index fa82dc4..36ca294 100644
--- a/002-manpages.patch
+++ b/002-manpages.patch
@@ -4,7 +4,7 @@ index 0000000000..7ac2af882c
 --- /dev/null
 +++ b/docs/man/man1/grafana-cli.1
 @@ -0,0 +1,60 @@
-+.TH GRAFANA "1" "December 2020" "Grafana cli version 7.3.6" "User Commands"
++.TH GRAFANA "1" "October 2021" "Grafana cli version 7.5.11" "User Commands"
 +.SH NAME
 +grafana-cli \- command line administration for the Grafana metrics dashboard and graph editor
 +.SH DESCRIPTION
@@ -69,8 +69,8 @@ new file mode 100644
 index 0000000000..c616268b31
 --- /dev/null
 +++ b/docs/man/man1/grafana-server.1
-@@ -0,0 +1,84 @@
-+.TH VERSION "1" "December 2020" "Version 7.3.6" "User Commands"
+@@ -0,0 +1,72 @@
++.TH VERSION "1" "October 2021" "Version 7.5.11" "User Commands"
 +.SH NAME
 +grafana-server \- back-end server for the Grafana metrics dashboard and graph editor
 +.SH DESCRIPTION
@@ -106,18 +106,6 @@ index 0000000000..c616268b31
 +.IP
 +path to config file
 +.HP
-+\fB\-convey-json\fR
-+.IP
-+When true, emits results in JSON blocks. Default: 'false'
-+.HP
-+\fB\-convey-silent\fR
-+.IP
-+When true, all output from GoConvey is suppressed.
-+.HP
-+\fB\-convey-story\fR
-+.IP
-+When true, emits story output, otherwise emits dot output. When not provided, this flag mirrors the value of the '-test.v' flag
-+.HP
 +\fB\-homepath\fR string
 +.IP
 +path to grafana install/home path, defaults to working directory
diff --git a/004-pin-yarn-version.patch b/004-pin-yarn-version.patch
deleted file mode 100644
index 3f12d84..0000000
--- a/004-pin-yarn-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/package.json b/package.json
-index ce11ba6de8..a3210762ed 100644
---- a/package.json
-+++ b/package.json
-@@ -314,6 +314,7 @@
-     "node": ">= 14"
-   },
-   "volta": {
--    "node": "14.15.1"
-+    "node": "12.19.0",
-+    "yarn": "1.22.10"
-   }
- }
diff --git a/005-remove-unused-dependencies.patch b/004-remove-unused-dependencies.patch
similarity index 100%
rename from 005-remove-unused-dependencies.patch
rename to 004-remove-unused-dependencies.patch
diff --git a/006-fix-gtime-test-32bit.patch b/005-fix-gtime-test-32bit.patch
similarity index 100%
rename from 006-fix-gtime-test-32bit.patch
rename to 005-fix-gtime-test-32bit.patch
diff --git a/008-remove-unused-frontend-crypto.patch b/006-remove-unused-frontend-crypto.patch
similarity index 100%
rename from 008-remove-unused-frontend-crypto.patch
rename to 006-remove-unused-frontend-crypto.patch
diff --git a/009-patch-unused-backend-crypto.patch b/007-patch-unused-backend-crypto.patch
similarity index 100%
rename from 009-patch-unused-backend-crypto.patch
rename to 007-patch-unused-backend-crypto.patch
diff --git a/007-skip-x86-goldenfiles-tests.patch b/007-skip-x86-goldenfiles-tests.patch
deleted file mode 100644
index bb61e0b..0000000
--- a/007-skip-x86-goldenfiles-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts b/packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts
-index 96efaccfce..bcdd98144f 100644
---- a/packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts
-+++ b/packages/grafana-data/src/dataframe/ArrowDataFrame.test.ts
-@@ -52,7 +52,7 @@ describe('Read/Write arrow Table to DataFrame', () => {
-     expect(after).toEqual(before);
-   });
- 
--  test('should read all types', () => {
-+  test.skip('should read all types', () => {
-     const fullpath = path.resolve(__dirname, './__snapshots__/all_types.golden.arrow');
-     const arrow = fs.readFileSync(fullpath);
-     const table = Table.from([arrow]);
-diff --git a/packages/grafana-runtime/src/utils/queryResponse.test.ts b/packages/grafana-runtime/src/utils/queryResponse.test.ts
-index 0adb915d2c..8985d7beab 100644
---- a/packages/grafana-runtime/src/utils/queryResponse.test.ts
-+++ b/packages/grafana-runtime/src/utils/queryResponse.test.ts
-@@ -47,7 +47,7 @@ const emptyResults = {
- /* eslint-enable */
- 
- describe('Query Response parser', () => {
--  test('should parse output with dataframe', () => {
-+  test.skip('should parse output with dataframe', () => {
-     const res = toDataQueryResponse(resp);
-     const frames = res.data;
-     expect(frames).toHaveLength(2);
-@@ -131,7 +131,7 @@ describe('Query Response parser', () => {
-     `);
-   });
- 
--  test('should parse output with dataframe in order of queries', () => {
-+  test.skip('should parse output with dataframe in order of queries', () => {
-     const queries: DataQuery[] = [{ refId: 'B' }, { refId: 'A' }];
-     const res = toDataQueryResponse(resp, queries);
-     const frames = res.data;
-@@ -250,7 +250,7 @@ describe('Query Response parser', () => {
-     expect(ids).toEqual(['A', 'B', 'X']);
-   });
- 
--  test('resultWithError', () => {
-+  test.skip('resultWithError', () => {
-     // Generated from:
-     // qdr.Responses[q.GetRefID()] = backend.DataResponse{
-     //   Error: fmt.Errorf("an Error: %w", fmt.Errorf("another error")),
-diff --git a/pkg/tsdb/influxdb/flux/executor_test.go b/pkg/tsdb/influxdb/flux/executor_test.go
-index 7cfc8bd20a..add6b5f3b8 100644
---- a/pkg/tsdb/influxdb/flux/executor_test.go
-+++ b/pkg/tsdb/influxdb/flux/executor_test.go
-@@ -68,6 +68,7 @@ func executeMockedQuery(t *testing.T, name string, query queryModel) *backend.Da
- }
- 
- func verifyGoldenResponse(t *testing.T, name string) *backend.DataResponse {
-+	t.Skip("x86 memory dump is not compatible with other architectures")
- 	dr := executeMockedQuery(t, name, queryModel{MaxDataPoints: 100})
- 
- 	err := experimental.CheckGoldenDataResponse(filepath.Join("testdata", fmt.Sprintf("%s.golden.txt", name)),
-diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
-index afc8ba357b..587092a58d 100644
---- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
-+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
-@@ -78,7 +78,7 @@ describe('CloudWatchDatasource', () => {
-   });
- 
-   describe('When getting log groups', () => {
--    it('should return log groups as an array of strings', async () => {
-+    it.skip('should return log groups as an array of strings', async () => {
-       const response = {
-         results: {
-           A: {
diff --git a/distro-defaults.ini b/distro-defaults.ini
index d925297..daa0679 100644
--- a/distro-defaults.ini
+++ b/distro-defaults.ini
@@ -66,6 +66,13 @@ cert_key =
 # Unix socket path
 socket = /tmp/grafana.sock
 
+# CDN Url
+cdn_url =
+
+# Sets the maximum time in minutes before timing out read of an incoming request and closing idle connections.
+# `0` means there is no timeout for reading the request.
+read_timeout = 0
+
 #################################### Database ############################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -98,6 +105,12 @@ log_queries =
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable
 
+# Database drivers may support different transaction isolation levels.
+# Currently, only "mysql" driver supports isolation levels.
+# If the value is empty - driver's default isolation level is applied.
+# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
+isolation_level =
+
 ca_cert_path =
 client_key_path =
 client_cert_path =
@@ -142,9 +155,17 @@ tls_handshake_timeout_seconds = 10
 # waiting for the server to approve.
 expect_continue_timeout_seconds = 1
 
+# Optionally limits the total number of connections per host, including connections in the dialing,
+# active, and idle states. On limit violation, dials will block.
+# A value of zero (0) means no limit.
+max_conns_per_host = 0
+
 # The maximum number of idle connections that Grafana will keep alive.
 max_idle_connections = 100
 
+# The maximum number of idle connections per host that Grafana will keep alive.
+max_idle_connections_per_host = 2
+
 # How many seconds the data proxy keeps an idle connection open before timing out.
 idle_conn_timeout_seconds = 90
 
@@ -159,6 +180,9 @@ send_user_header = false
 # Change this option to false to disable reporting.
 reporting_enabled = false
 
+# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
+reporting_distributor = grafana-labs
+
 # Set to false to disable all checks to https://grafana.com
 # for new versions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
@@ -227,6 +251,13 @@ x_content_type_options = true
 # when they detect reflected cross-site scripting (XSS) attacks.
 x_xss_protection = true
 
+# Enable adding the Content-Security-Policy header to your requests.
+# CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
+content_security_policy = false
+
+# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
+# $NONCE in the template includes a random nonce.
+content_security_policy_template = """script-src 'unsafe-eval' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data:;base-uri 'self';connect-src 'self' grafana.com;manifest-src 'self';media-src 'none';form-action 'self';"""
 
 #################################### Snapshots ###########################
 [snapshots]
@@ -255,6 +286,11 @@ min_refresh_interval = 1s
 # Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
 default_home_dashboard_path =
 
+################################### Data sources #########################
+[datasources]
+# Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
+datasource_limit = 5000
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -282,6 +318,9 @@ password_hint = password
 # Default UI theme ("dark" or "light")
 default_theme = dark
 
+# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
+home_page =
+
 # External user management
 external_manage_link_url =
 external_manage_link_name =
@@ -296,6 +335,9 @@ editors_can_admin = false
 # The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
 user_invite_max_lifetime_duration = 24h
 
+# Enter a comma-separated list of usernames to hide them in the Grafana UI. These users are shown to Grafana admins and to themselves.
+hidden_users =
+
 [auth]
 # Login cookie name
 login_cookie_name = grafana_session
@@ -442,6 +484,7 @@ scopes = user:email
 email_attribute_name = email:primary
 email_attribute_path =
 login_attribute_path =
+name_attribute_path =
 role_attribute_path =
 id_token_attribute_name =
 auth_url =
@@ -478,11 +521,24 @@ enabled = false
 config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
 
-# LDAP backround sync (Enterprise only)
+# LDAP background sync (Enterprise only)
 # At 1 am every day
 sync_cron = "0 0 1 * * *"
 active_sync_enabled = true
 
+#################################### AWS ###########################
+[aws]
+# Enter a comma-separated list of allowed AWS authentication providers.
+# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
+allowed_auth_providers = default,keys,credentials
+
+# Allow AWS users to assume a role using temporary security credentials.
+# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
+assume_role_enabled = true
+
+# Specify max no of pages to be returned by the ListMetricPages API
+list_metrics_page_limit = 500
+
 #################################### SMTP / Emailing #####################
 [smtp]
 enabled = false
@@ -559,6 +615,25 @@ facility =
 # Syslog tag. By default, the process' argv[0] is used.
 tag =
 
+[log.frontend]
+# Should Sentry javascript agent be initialized
+enabled = false
+
+# Sentry DSN if you want to send events to Sentry.
+sentry_dsn =
+
+# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
+custom_endpoint = /log
+
+# Rate of events to be reported between 0 (none) and 1 (all), float
+sample_rate = 1.0
+
+# Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint (/log).
+log_endpoint_requests_per_second_limit = 3
+
+# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log)
+log_endpoint_burst_limit = 15
+
 #################################### Usage Quotas ########################
 [quota]
 enabled = false
@@ -631,6 +706,9 @@ max_annotation_age =
 max_annotations_to_keep =
 
 #################################### Annotations #########################
+[annotations]
+# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
+cleanupjob_batchsize = 100
 
 [annotations.dashboard]
 # Dashboard annotations means that annotations are associated with the dashboard they are created on.
@@ -858,3 +936,7 @@ use_browser_locale = false
 
 # Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
 default_timezone = browser
+
+[expressions]
+# Enable or disable the expressions functionality.
+enabled = true
diff --git a/grafana.spec b/grafana.spec
index 6948322..f0e9074 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -7,7 +7,7 @@
 
 Name:             grafana
 Version:          7.5.11
-Release:          1
+Release:          2
 Summary:          Metrics dashboard and graph editor
 License:          Apache 2.0
 URL:              https://grafana.org
@@ -26,12 +26,10 @@ Patch2:           002-manpages.patch
 # remove failing assertions due to a symlink
 # BUILD/src/github.com/grafana/grafana -> BUILD/grafana-X.Y.Z
 Patch3:           003-fix-dashboard-abspath-test.patch
-Patch4:           004-pin-yarn-version.patch
-Patch5:           005-remove-unused-dependencies.patch
-Patch6:           006-fix-gtime-test-32bit.patch
-Patch7:           007-skip-x86-goldenfiles-tests.patch
-Patch8:           008-remove-unused-frontend-crypto.patch
-Patch9:           009-patch-unused-backend-crypto.patch
+Patch4:           004-remove-unused-dependencies.patch
+Patch5:           005-fix-gtime-test-32bit.patch
+Patch6:           006-remove-unused-frontend-crypto.patch
+Patch7:           007-patch-unused-backend-crypto.patch
 
 BuildRequires:    git, systemd, golang 
 
@@ -75,95 +73,110 @@ Provides:         grafana-stackdriver = 7.3.6-1
 # 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(cloud.google.com/go/storage)) = 1.10.0
+Provides: bundled(golang(cloud.google.com/go/storage)) = 1.13.0
 Provides: bundled(golang(github.com/BurntSushi/toml)) = 0.3.1
 Provides: bundled(golang(github.com/VividCortex/mysqlerr)) = 0.0.0-20170204212430.6c6b55f8796f
-Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.33.12
+Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.37.20
 Provides: bundled(golang(github.com/beevik/etree)) = 1.1.0
 Provides: bundled(golang(github.com/benbjohnson/clock)) = 0.0.0-20161215174838.7dc76406b6d3
 Provides: bundled(golang(github.com/bradfitz/gomemcache)) = 0.0.0-20190913173617.a41fca850d0b
-Provides: bundled(golang(github.com/centrifugal/centrifuge)) = 0.11.0
+Provides: bundled(golang(github.com/centrifugal/centrifuge)) = 0.13.0
+Provides: bundled(golang(github.com/cortexproject/cortex)) = 1.4.1-0.20201022071705.85942c5703cf
 Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
-Provides: bundled(golang(github.com/denisenkom/go-mssqldb)) = 0.0.0-20200620013148.b91950f658ec
+Provides: bundled(golang(github.com/denisenkom/go-mssqldb)) = 0.0.0-20200910202707.1e08a3fab204
 Provides: bundled(golang(github.com/facebookgo/inject)) = 0.0.0-20180706035515.f23751cae28b
-Provides: bundled(golang(github.com/fatih/color)) = 1.9.0
+Provides: bundled(golang(github.com/fatih/color)) = 1.10.0
 Provides: bundled(golang(github.com/gchaincl/sqlhooks)) = 1.3.0
+Provides: bundled(golang(github.com/getsentry/sentry-go)) = 0.10.0
 Provides: bundled(golang(github.com/go-macaron/binding)) = 0.0.0-20190806013118.0b4f37bab25b
 Provides: bundled(golang(github.com/go-macaron/gzip)) = 0.0.0-20160222043647.cad1c6580a07
-Provides: bundled(golang(github.com/go-macaron/session)) = 0.0.0-20190805070824.1a3cdc6f5659
+Provides: bundled(golang(github.com/go-sourcemap/sourcemap)) = 2.1.3+incompatible
 Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.5.0
 Provides: bundled(golang(github.com/go-stack/stack)) = 1.8.0
 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3
+Provides: bundled(golang(github.com/golang/mock)) = 1.5.0
 Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.3
-Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.2
-Provides: bundled(golang(github.com/gosimple/slug)) = 1.4.2
+Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.4
+Provides: bundled(golang(github.com/google/uuid)) = 1.2.0
+Provides: bundled(golang(github.com/gosimple/slug)) = 1.9.0
+Provides: bundled(golang(github.com/grafana/grafana-aws-sdk)) = 0.4.0
 Provides: bundled(golang(github.com/grafana/grafana-plugin-model)) = 0.0.0-20190930120109.1fc953a61fb4
-Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.79.0
-Provides: bundled(golang(github.com/grafana/loki)) = 1.6.0
-Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 1.2.1
-Provides: bundled(golang(github.com/hashicorp/go-hclog)) = 0.12.2
-Provides: bundled(golang(github.com/hashicorp/go-plugin)) = 1.2.2
-Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.2.0
+Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.88.0
+Provides: bundled(golang(github.com/grafana/loki)) = 1.6.2-0.20201026154740.6978ee5d7387
+Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 1.2.2
+Provides: bundled(golang(github.com/hashicorp/go-hclog)) = 0.15.0
+Provides: bundled(golang(github.com/hashicorp/go-plugin)) = 1.4.0
+Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.2.1
 Provides: bundled(golang(github.com/inconshreveable/log15)) = 0.0.0-20180818164646.67afb5ed74ec
 Provides: bundled(golang(github.com/influxdata/influxdb-client-go/v2)) = 2.2.0
-Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.3.0
-Provides: bundled(golang(github.com/jung-kurt/gofpdf)) = 1.10.1
-Provides: bundled(golang(github.com/lib/pq)) = 1.3.0
-Provides: bundled(golang(github.com/linkedin/goavro/v2)) = 2.9.7
-Provides: bundled(golang(github.com/magefile/mage)) = 1.9.0
+Provides: bundled(golang(github.com/jaegertracing/jaeger)) = 1.22.1-0.20210304164023.2fff3ca58910
+Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0
+Provides: bundled(golang(github.com/json-iterator/go)) = 1.1.10
+Provides: bundled(golang(github.com/lib/pq)) = 1.9.0
+Provides: bundled(golang(github.com/linkedin/goavro/v2)) = 2.10.0
+Provides: bundled(golang(github.com/magefile/mage)) = 1.11.0
 Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12
-Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.11.0
+Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.14.6
+Provides: bundled(golang(github.com/mwitkow/go-conntrack)) = 0.0.0-20190716064945.2f068394615f
 Provides: bundled(golang(github.com/opentracing/opentracing-go)) = 1.2.0
 Provides: bundled(golang(github.com/patrickmn/go-cache)) = 2.1.0+incompatible
 Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1
-Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.8.0
+Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.9.0
 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.2.0
-Provides: bundled(golang(github.com/prometheus/common)) = 0.14.0
+Provides: bundled(golang(github.com/prometheus/common)) = 0.18.0
 Provides: bundled(golang(github.com/robfig/cron)) = 0.0.0-20180505203441.b41be1df6967
-Provides: bundled(golang(github.com/robfig/cron/v3)) = 3.0.0
+Provides: bundled(golang(github.com/robfig/cron/v3)) = 3.0.1
 Provides: bundled(golang(github.com/russellhaering/goxmldsig)) = 1.1.0
 Provides: bundled(golang(github.com/smartystreets/goconvey)) = 1.6.4
-Provides: bundled(golang(github.com/stretchr/testify)) = 1.6.1
+Provides: bundled(golang(github.com/stretchr/testify)) = 1.7.0
 Provides: bundled(golang(github.com/teris-io/shortid)) = 0.0.0-20171029131806.771a37caa5cf
 Provides: bundled(golang(github.com/timberio/go-datemath)) = 0.1.1-0.20200323150745.74ddef604fff
 Provides: bundled(golang(github.com/ua-parser/uap-go)) = 0.0.0-20190826212731.daf92ba38329
 Provides: bundled(golang(github.com/uber/jaeger-client-go)) = 2.25.0+incompatible
 Provides: bundled(golang(github.com/unknwon/com)) = 1.0.1
-Provides: bundled(golang(github.com/urfave/cli/v2)) = 2.1.1
+Provides: bundled(golang(github.com/urfave/cli/v2)) = 2.3.0
 Provides: bundled(golang(github.com/weaveworks/common)) = 0.0.0-20201119133501.0619918236ec
 Provides: bundled(golang(github.com/xorcare/pointer)) = 1.1.0
 Provides: bundled(golang(github.com/yudai/gojsondiff)) = 1.0.0
-Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20201208171446.5f87f3452ae9
-Provides: bundled(golang(golang.org/x/net)) = 0.0.0-20201022231255.08b38378de70
-Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200902213428.5d25da1a8d43
-Provides: bundled(golang(golang.org/x/sync)) = 0.0.0-20201020160332.67f06af15bc9
+Provides: bundled(golang(go.opentelemetry.io/collector)) = 0.21.0
+Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20201221181555.eec23a3978ad
+Provides: bundled(golang(golang.org/x/net)) = 0.0.0-20210119194325.5f4716e94777
+Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20210113205817.d3ed898aa8a3
+Provides: bundled(golang(golang.org/x/sync)) = 0.0.0-20201207232520.09787c993a3a
 Provides: bundled(golang(golang.org/x/time)) = 0.0.0-20200630173020.3af7569d3a1e
-Provides: bundled(golang(google.golang.org/grpc)) = 1.33.1
-Provides: bundled(golang(gopkg.in/ini.v1)) = 1.51.0
+Provides: bundled(golang(gonum.org/v1/gonum)) = 0.8.2
+Provides: bundled(golang(google.golang.org/api)) = 0.40.0
+Provides: bundled(golang(google.golang.org/grpc)) = 1.36.0
+Provides: bundled(golang(gopkg.in/ini.v1)) = 1.62.0
 Provides: bundled(golang(gopkg.in/ldap.v3)) = 3.0.2
 Provides: bundled(golang(gopkg.in/macaron.v1)) = 1.4.0
 Provides: bundled(golang(gopkg.in/mail.v2)) = 2.3.1
 Provides: bundled(golang(gopkg.in/redis.v5)) = 5.2.9
-Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.4.1
-Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.3.0
+Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.5.1
+Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.4.0
 Provides: bundled(golang(xorm.io/core)) = 0.7.3
-Provides: bundled(golang(xorm.io/xorm)) = 0.8.1
-Provides: bundled(npm(@babel/core)) = 7.6.2
+Provides: bundled(golang(xorm.io/xorm)) = 0.8.2
+Provides: bundled(npm(@babel/core)) = 7.6.4
 Provides: bundled(npm(@babel/plugin-proposal-nullish-coalescing-operator)) = 7.8.3
 Provides: bundled(npm(@babel/plugin-proposal-optional-chaining)) = 7.8.3
-Provides: bundled(npm(@babel/plugin-syntax-dynamic-import)) = 7.2.0
-Provides: bundled(npm(@babel/preset-env)) = 7.6.3
-Provides: bundled(npm(@babel/preset-react)) = 7.6.3
+Provides: bundled(npm(@babel/plugin-syntax-dynamic-import)) = 7.7.4
+Provides: bundled(npm(@babel/preset-env)) = 7.7.4
+Provides: bundled(npm(@babel/preset-react)) = 7.8.3
 Provides: bundled(npm(@babel/preset-typescript)) = 7.8.3
 Provides: bundled(npm(@emotion/core)) = 10.0.21
-Provides: bundled(npm(@grafana/api-documenter)) = 0.9.3
+Provides: bundled(npm(@grafana/api-documenter)) = 7.11.2
 Provides: bundled(npm(@grafana/api-extractor)) = 7.10.1
-Provides: bundled(npm(@grafana/eslint-config)) = 2.0.3
+Provides: bundled(npm(@grafana/aws-sdk)) = 0.0.3
+Provides: bundled(npm(@grafana/eslint-config)) = 2.3.0
 Provides: bundled(npm(@grafana/slate-react)) = 0.22.9-grafana
-Provides: bundled(npm(@reduxjs/toolkit)) = 1.3.4
+Provides: bundled(npm(@popperjs/core)) = 2.5.4
+Provides: bundled(npm(@reduxjs/toolkit)) = 1.5.0
 Provides: bundled(npm(@rtsao/plugin-proposal-class-properties)) = 7.0.1-patch.1
-Provides: bundled(npm(@testing-library/jest-dom)) = 5.11.3
-Provides: bundled(npm(@testing-library/react)) = 10.4.8
+Provides: bundled(npm(@sentry/browser)) = 5.25.0
+Provides: bundled(npm(@sentry/types)) = 5.24.2
+Provides: bundled(npm(@sentry/utils)) = 5.24.2
+Provides: bundled(npm(@testing-library/jest-dom)) = 5.11.5
+Provides: bundled(npm(@testing-library/react)) = 11.1.2
 Provides: bundled(npm(@testing-library/react-hooks)) = 3.2.1
 Provides: bundled(npm(@testing-library/user-event)) = 12.1.3
 Provides: bundled(npm(@torkelo/react-select)) = 3.0.8
@@ -175,28 +188,29 @@ Provides: bundled(npm(@types/classnames)) = 2.2.7
 Provides: bundled(npm(@types/clipboard)) = 2.0.1
 Provides: bundled(npm(@types/common-tags)) = 1.8.0
 Provides: bundled(npm(@types/d3)) = 5.7.2
+Provides: bundled(npm(@types/d3-force)) = 1.2.1
 Provides: bundled(npm(@types/d3-scale-chromatic)) = 1.3.1
+Provides: bundled(npm(@types/debounce-promise)) = 3.1.3
 Provides: bundled(npm(@types/enzyme)) = 3.10.3
 Provides: bundled(npm(@types/enzyme-adapter-react-16)) = 1.0.6
 Provides: bundled(npm(@types/file-saver)) = 2.0.1
 Provides: bundled(npm(@types/hoist-non-react-statics)) = 3.3.1
 Provides: bundled(npm(@types/is-hotkey)) = 0.1.1
-Provides: bundled(npm(@types/jest)) = 23.3.14
+Provides: bundled(npm(@types/jest)) = 26.0.12
 Provides: bundled(npm(@types/jquery)) = 3.3.38
 Provides: bundled(npm(@types/jsurl)) = 1.2.28
 Provides: bundled(npm(@types/lodash)) = 4.14.123
 Provides: bundled(npm(@types/lru-cache)) = 5.1.0
-Provides: bundled(npm(@types/marked)) = 1.1.0
 Provides: bundled(npm(@types/md5)) = 2.1.33
 Provides: bundled(npm(@types/moment-timezone)) = 0.5.13
 Provides: bundled(npm(@types/mousetrap)) = 1.6.3
 Provides: bundled(npm(@types/node)) = 10.14.1
 Provides: bundled(npm(@types/papaparse)) = 5.2.0
 Provides: bundled(npm(@types/prismjs)) = 1.16.0
-Provides: bundled(npm(@types/react)) = 16.8.16
+Provides: bundled(npm(@types/react)) = 16.9.9
 Provides: bundled(npm(@types/react-beautiful-dnd)) = 12.1.2
-Provides: bundled(npm(@types/react-dom)) = 16.8.4
-Provides: bundled(npm(@types/react-grid-layout)) = 0.16.7
+Provides: bundled(npm(@types/react-dom)) = 16.9.2
+Provides: bundled(npm(@types/react-grid-layout)) = 1.1.1
 Provides: bundled(npm(@types/react-loadable)) = 5.5.2
 Provides: bundled(npm(@types/react-redux)) = 7.1.7
 Provides: bundled(npm(@types/react-select)) = 3.0.8
@@ -210,26 +224,25 @@ Provides: bundled(npm(@types/reselect)) = 2.2.0
 Provides: bundled(npm(@types/slate)) = 0.47.1
 Provides: bundled(npm(@types/slate-plain-serializer)) = 0.6.1
 Provides: bundled(npm(@types/slate-react)) = 0.22.5
-Provides: bundled(npm(@types/sockjs-client)) = 1.1.1
-Provides: bundled(npm(@types/testing-library__jest-dom)) = 5.9.2
+Provides: bundled(npm(@types/testing-library__jest-dom)) = 5.9.5
 Provides: bundled(npm(@types/testing-library__react-hooks)) = 3.1.0
 Provides: bundled(npm(@types/tinycolor2)) = 1.4.1
 Provides: bundled(npm(@types/uuid)) = 8.3.0
-Provides: bundled(npm(@typescript-eslint/eslint-plugin)) = 4.0.1
-Provides: bundled(npm(@typescript-eslint/parser)) = 4.0.1
+Provides: bundled(npm(@typescript-eslint/eslint-plugin)) = 4.15.0
+Provides: bundled(npm(@typescript-eslint/parser)) = 4.15.0
 Provides: bundled(npm(@welldone-software/why-did-you-render)) = 4.0.6
+Provides: bundled(npm(@wojtekmaj/enzyme-adapter-react-17)) = 0.3.1
 Provides: bundled(npm(abortcontroller-polyfill)) = 1.4.0
-Provides: bundled(npm(angular)) = 1.6.9
+Provides: bundled(npm(angular)) = 1.8.2
 Provides: bundled(npm(angular-bindonce)) = 0.3.1
 Provides: bundled(npm(angular-mocks)) = 1.6.6
-Provides: bundled(npm(angular-native-dragdrop)) = 1.2.2
-Provides: bundled(npm(angular-route)) = 1.6.6
-Provides: bundled(npm(angular-sanitize)) = 1.6.6
+Provides: bundled(npm(angular-route)) = 1.8.2
+Provides: bundled(npm(angular-sanitize)) = 1.8.2
 Provides: bundled(npm(antlr4)) = 4.8.0
 Provides: bundled(npm(autoprefixer)) = 9.7.4
-Provides: bundled(npm(axios)) = 0.19.0
+Provides: bundled(npm(axios)) = 0.21.1
 Provides: bundled(npm(babel-core)) = 7.0.0-bridge.0
-Provides: bundled(npm(babel-jest)) = 24.8.0
+Provides: bundled(npm(babel-jest)) = 26.6.3
 Provides: bundled(npm(babel-loader)) = 8.0.6
 Provides: bundled(npm(babel-plugin-angularjs-annotate)) = 0.10.0
 Provides: bundled(npm(baron)) = 3.0.3
@@ -241,43 +254,34 @@ Provides: bundled(npm(clean-webpack-plugin)) = 3.0.0
 Provides: bundled(npm(clipboard)) = 2.0.4
 Provides: bundled(npm(common-tags)) = 1.8.0
 Provides: bundled(npm(core-js)) = 1.2.7
-Provides: bundled(npm(css-loader)) = 3.2.0
+Provides: bundled(npm(css-loader)) = 3.4.2
 Provides: bundled(npm(d3)) = 5.15.0
+Provides: bundled(npm(d3-force)) = 1.2.1
 Provides: bundled(npm(d3-scale-chromatic)) = 1.5.0
 Provides: bundled(npm(dangerously-set-html-content)) = 1.0.6
+Provides: bundled(npm(debounce-promise)) = 3.1.2
 Provides: bundled(npm(emotion)) = 10.0.27
 Provides: bundled(npm(enzyme)) = 3.11.0
-Provides: bundled(npm(enzyme-adapter-react-16)) = 1.15.2
 Provides: bundled(npm(enzyme-to-json)) = 3.4.4
+Provides: bundled(npm(es-abstract)) = 1.18.0-next.1
 Provides: bundled(npm(es6-promise)) = 4.2.8
 Provides: bundled(npm(es6-shim)) = 0.35.5
 Provides: bundled(npm(eslint)) = 2.13.1
-Provides: bundled(npm(eslint-config-prettier)) = 6.11.0
-Provides: bundled(npm(eslint-plugin-jsdoc)) = 28.6.1
-Provides: bundled(npm(eslint-plugin-prettier)) = 3.1.4
-Provides: bundled(npm(eslint-plugin-react-hooks)) = 4.0.5
+Provides: bundled(npm(eslint-config-prettier)) = 7.2.0
+Provides: bundled(npm(eslint-plugin-jsdoc)) = 31.6.1
+Provides: bundled(npm(eslint-plugin-no-only-tests)) = 2.4.0
+Provides: bundled(npm(eslint-plugin-prettier)) = 3.3.1
+Provides: bundled(npm(eslint-plugin-react)) = 7.22.0
+Provides: bundled(npm(eslint-plugin-react-hooks)) = 4.2.0
 Provides: bundled(npm(eventemitter3)) = 3.1.2
 Provides: bundled(npm(expect.js)) = 0.3.1
 Provides: bundled(npm(expose-loader)) = 0.7.5
 Provides: bundled(npm(fast-text-encoding)) = 1.0.0
-Provides: bundled(npm(file-loader)) = 4.3.0
+Provides: bundled(npm(file-loader)) = 5.0.2
 Provides: bundled(npm(file-saver)) = 2.0.2
 Provides: bundled(npm(fork-ts-checker-webpack-plugin)) = 1.0.0
 Provides: bundled(npm(gaze)) = 1.1.3
-Provides: bundled(npm(glob)) = 5.0.15
-Provides: bundled(npm(grunt)) = 1.0.4
-Provides: bundled(npm(grunt-angular-templates)) = 1.1.0
-Provides: bundled(npm(grunt-cli)) = 1.2.0
-Provides: bundled(npm(grunt-contrib-clean)) = 2.0.0
-Provides: bundled(npm(grunt-contrib-compress)) = 1.6.0
-Provides: bundled(npm(grunt-contrib-copy)) = 1.0.0
-Provides: bundled(npm(grunt-exec)) = 3.0.0
-Provides: bundled(npm(grunt-newer)) = 1.3.0
-Provides: bundled(npm(grunt-notify)) = 0.4.5
-Provides: bundled(npm(grunt-postcss)) = 0.9.0
-Provides: bundled(npm(grunt-sass-lint)) = 0.2.4
-Provides: bundled(npm(grunt-usemin)) = 3.1.1
-Provides: bundled(npm(grunt-webpack)) = 3.1.3
+Provides: bundled(npm(glob)) = 7.1.3
 Provides: bundled(npm(hoist-non-react-statics)) = 2.5.5
 Provides: bundled(npm(html-loader)) = 0.5.5
 Provides: bundled(npm(html-webpack-harddisk-plugin)) = 1.0.1
@@ -285,17 +289,17 @@ Provides: bundled(npm(html-webpack-plugin)) = 3.2.0
 Provides: bundled(npm(husky)) = 4.2.1
 Provides: bundled(npm(immutable)) = 3.8.2
 Provides: bundled(npm(is-hotkey)) = 0.1.4
-Provides: bundled(npm(jest)) = 25.5.4
-Provides: bundled(npm(jest-canvas-mock)) = 2.1.2
+Provides: bundled(npm(jest)) = 26.6.3
+Provides: bundled(npm(jest-canvas-mock)) = 2.3.0
 Provides: bundled(npm(jest-date-mock)) = 1.0.8
-Provides: bundled(npm(jquery)) = 3.4.1
+Provides: bundled(npm(jest-matcher-utils)) = 26.0.0
+Provides: bundled(npm(jquery)) = 3.5.1
 Provides: bundled(npm(jsurl)) = 0.1.5
-Provides: bundled(npm(lerna)) = 3.20.2
+Provides: bundled(npm(lerna)) = 3.22.1
 Provides: bundled(npm(lint-staged)) = 10.0.7
 Provides: bundled(npm(load-grunt-tasks)) = 5.1.0
-Provides: bundled(npm(lodash)) = 3.10.1
+Provides: bundled(npm(lodash)) = 4.17.21
 Provides: bundled(npm(lru-cache)) = 4.1.5
-Provides: bundled(npm(marked)) = 0.3.19
 Provides: bundled(npm(md5)) = 2.2.1
 Provides: bundled(npm(memoize-one)) = 4.1.0
 Provides: bundled(npm(mini-css-extract-plugin)) = 0.7.0
@@ -309,31 +313,32 @@ Provides: bundled(npm(mousetrap)) = 1.6.5
 Provides: bundled(npm(mousetrap-global-bind)) = 1.1.0
 Provides: bundled(npm(mutationobserver-shim)) = 0.3.3
 Provides: bundled(npm(ngtemplate-loader)) = 2.0.1
-Provides: bundled(npm(node-sass)) = 4.13.1
 Provides: bundled(npm(nodemon)) = 2.0.2
-Provides: bundled(npm(optimize-css-assets-webpack-plugin)) = 5.0.3
-Provides: bundled(npm(papaparse)) = 4.6.3
+Provides: bundled(npm(optimize-css-assets-webpack-plugin)) = 5.0.4
+Provides: bundled(npm(papaparse)) = 5.3.0
 Provides: bundled(npm(postcss-browser-reporter)) = 0.6.0
 Provides: bundled(npm(postcss-loader)) = 3.0.0
 Provides: bundled(npm(postcss-reporter)) = 6.0.1
-Provides: bundled(npm(prettier)) = 1.18.2
-Provides: bundled(npm(prismjs)) = 1.17.1
+Provides: bundled(npm(prettier)) = 2.0.5
+Provides: bundled(npm(prismjs)) = 1.21.0
 Provides: bundled(npm(prop-types)) = 15.7.2
 Provides: bundled(npm(rc-cascader)) = 1.0.1
 Provides: bundled(npm(re-resizable)) = 6.2.0
-Provides: bundled(npm(react)) = 16.10.2
-Provides: bundled(npm(react-dom)) = 16.10.2
-Provides: bundled(npm(react-grid-layout)) = 0.17.1
+Provides: bundled(npm(react)) = 16.13.1
+Provides: bundled(npm(react-beautiful-dnd)) = 13.0.0
+Provides: bundled(npm(react-dom)) = 17.0.1
+Provides: bundled(npm(react-grid-layout)) = 1.2.0
 Provides: bundled(npm(react-highlight-words)) = 0.16.0
 Provides: bundled(npm(react-hot-loader)) = 4.8.0
 Provides: bundled(npm(react-loadable)) = 5.5.0
-Provides: bundled(npm(react-popper)) = 1.3.3
+Provides: bundled(npm(react-popper)) = 2.2.4
 Provides: bundled(npm(react-redux)) = 7.2.0
 Provides: bundled(npm(react-reverse-portal)) = 2.0.1
-Provides: bundled(npm(react-sizeme)) = 2.6.8
+Provides: bundled(npm(react-select-event)) = 5.1.0
+Provides: bundled(npm(react-sizeme)) = 2.6.12
 Provides: bundled(npm(react-split-pane)) = 0.1.89
 Provides: bundled(npm(react-test-renderer)) = 16.10.2
-Provides: bundled(npm(react-transition-group)) = 2.9.0
+Provides: bundled(npm(react-transition-group)) = 4.3.0
 Provides: bundled(npm(react-use)) = 13.27.0
 Provides: bundled(npm(react-virtualized-auto-sizer)) = 1.0.2
 Provides: bundled(npm(react-window)) = 1.8.5
@@ -348,29 +353,30 @@ Provides: bundled(npm(rimraf)) = 2.6.3
 Provides: bundled(npm(rst2html)) = 1.0.4
 Provides: bundled(npm(rxjs)) = 6.5.5
 Provides: bundled(npm(rxjs-spy)) = 7.5.1
+Provides: bundled(npm(sass)) = 1.27.0
 Provides: bundled(npm(sass-lint)) = 1.12.1
 Provides: bundled(npm(sass-loader)) = 8.0.2
 Provides: bundled(npm(search-query-parser)) = 1.5.4
 Provides: bundled(npm(sinon)) = 8.1.1
 Provides: bundled(npm(slate)) = 0.47.8
 Provides: bundled(npm(slate-plain-serializer)) = 0.7.10
-Provides: bundled(npm(sockjs-client)) = 1.4.0
 Provides: bundled(npm(style-loader)) = 1.1.3
-Provides: bundled(npm(terser-webpack-plugin)) = 1.4.1
+Provides: bundled(npm(terser-webpack-plugin)) = 1.4.5
 Provides: bundled(npm(tether)) = 1.4.7
 Provides: bundled(npm(tether-drop)) = 1.5.0
 Provides: bundled(npm(tinycolor2)) = 1.4.1
-Provides: bundled(npm(ts-jest)) = 26.3.0
-Provides: bundled(npm(ts-node)) = 8.8.1
+Provides: bundled(npm(ts-jest)) = 26.4.4
+Provides: bundled(npm(ts-node)) = 9.0.0
 Provides: bundled(npm(tslib)) = 1.10.0
 Provides: bundled(npm(tti-polyfill)) = 0.2.2
-Provides: bundled(npm(typescript)) = 3.7.5
+Provides: bundled(npm(typescript)) = 3.9.7
 Provides: bundled(npm(uuid)) = 3.3.3
-Provides: bundled(npm(webpack)) = 4.41.2
+Provides: bundled(npm(visjs-network)) = 4.25.0
+Provides: bundled(npm(webpack)) = 4.41.5
 Provides: bundled(npm(webpack-bundle-analyzer)) = 3.6.0
 Provides: bundled(npm(webpack-cleanup-plugin)) = 0.5.1
 Provides: bundled(npm(webpack-cli)) = 3.3.10
-Provides: bundled(npm(webpack-dev-server)) = 3.10.3
+Provides: bundled(npm(webpack-dev-server)) = 3.11.1
 Provides: bundled(npm(webpack-merge)) = 4.2.2
 Provides: bundled(npm(whatwg-fetch)) = 3.0.0
 Provides: bundled(npm(zone.js)) = 0.7.8
@@ -392,8 +398,6 @@ rm -r plugins-bundled
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 
 
@@ -559,6 +563,9 @@ rm -r pkg/macaron
 
 
 %changelog
+* Wed Nov 17 2021 wangkai <wangkai385@huawei.com> 7.5.11-2
+- Update Patch Source Provides
+
 * Fri Nov 12 2021 wangkai <wangkai385@huawei.com> 7.5.11-1
 - Upgrade to 7.5.11 for fix CVE-2021-39226
 
-- 
Gitee