From cba27cf9035de2e616cb1a811d6da976d2e759b6 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 6 Jul 2022 12:57:30 +0200 Subject: [PATCH] update to upstream Grafana 9.0.2 --- ...li-script-with-distro-specific-paths.patch | 2 +- 0002-add-manpages.patch | 2 +- 0003-update-default-configuration.patch | 10 +- ...4-remove-unused-backend-dependencies.patch | 97 ++-- 0004-skip-goldenfiles-tests.patch | 24 - ...> 0005-remove-unused-frontend-crypto.patch | 140 +++--- ...e-HMAC-SHA256-to-generate-password-r.patch | 8 +- ...patch => 0007-disable-husky-git-hook.patch | 6 +- 0007-patch-removed-backend-crypto.patch | 177 -------- ...skip-marketplace-plugin-install-test.patch | 4 +- ...nteger-overflow-in-rate-interval-cal.patch | 12 +- ...nteger-overflow-in-rate-interval-cal.patch | 20 + ...-vendor-patch-removed-backend-crypto.patch | 427 ++++++++++++++++++ ... 1002-vendor-use-pbkdf2-from-OpenSSL.patch | 5 +- 1003-vendor-skip-goldenfiles-tests.patch | 18 + Makefile | 21 +- README.md | 19 +- grafana.rpmlintrc | 19 +- grafana.spec | 415 +++++++++-------- sources | 6 +- 20 files changed, 836 insertions(+), 596 deletions(-) rename 0005-remove-unused-backend-dependencies.patch => 0004-remove-unused-backend-dependencies.patch (62%) delete mode 100644 0004-skip-goldenfiles-tests.patch rename 0006-remove-unused-frontend-crypto.patch => 0005-remove-unused-frontend-crypto.patch (89%) rename 0009-notifications-use-HMAC-SHA256-to-generate-password-r.patch => 0006-notifications-use-HMAC-SHA256-to-generate-password-r.patch (98%) rename 0010-disable-husky-git-hook.patch => 0007-disable-husky-git-hook.patch (80%) delete mode 100644 0007-patch-removed-backend-crypto.patch rename 0011-skip-marketplace-plugin-install-test.patch => 0008-skip-marketplace-plugin-install-test.patch (90%) rename 0012-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch => 0009-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch (59%) create mode 100644 0010-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch create mode 100644 1001-vendor-patch-removed-backend-crypto.patch rename 0008-FIPS.patch => 1002-vendor-use-pbkdf2-from-OpenSSL.patch (96%) create mode 100644 1003-vendor-skip-goldenfiles-tests.patch diff --git a/0001-update-grafana-cli-script-with-distro-specific-paths.patch b/0001-update-grafana-cli-script-with-distro-specific-paths.patch index d60b3b7..226097a 100644 --- a/0001-update-grafana-cli-script-with-distro-specific-paths.patch +++ b/0001-update-grafana-cli-script-with-distro-specific-paths.patch @@ -1,4 +1,4 @@ -From 97689bd948f5ce05a0d0f8d274eab211e397f742 Mon Sep 17 00:00:00 2001 +From fa9ef506a8168b9ab64ee6e479d76fe9df2174a1 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 22 Jun 2022 16:57:52 +0200 Subject: [PATCH] update grafana-cli script with distro-specific paths and diff --git a/0002-add-manpages.patch b/0002-add-manpages.patch index 98b9bd5..8984872 100644 --- a/0002-add-manpages.patch +++ b/0002-add-manpages.patch @@ -1,4 +1,4 @@ -From 0402fb034c2785d286f0d85f8e264a4ab8bfcb7a Mon Sep 17 00:00:00 2001 +From 1169b578b7a3aa1a96a0496c8e2f994f1796b853 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 22 Jun 2022 17:01:09 +0200 Subject: [PATCH] add manpages diff --git a/0003-update-default-configuration.patch b/0003-update-default-configuration.patch index 29f02fb..769036f 100644 --- a/0003-update-default-configuration.patch +++ b/0003-update-default-configuration.patch @@ -1,11 +1,11 @@ -From c06eac31fa3b8838d4dc070fa2b503d6b75b4010 Mon Sep 17 00:00:00 2001 +From 12da643fe5c9ff99a7d5ee439026be50a320eef5 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 22 Jun 2022 17:05:48 +0200 Subject: [PATCH] update default configuration diff --git a/conf/defaults.ini b/conf/defaults.ini -index 20aec3da61..0499838caa 100644 +index b2034acc9a..7137cd5707 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -190,7 +190,7 @@ row_limit = 1000000 @@ -27,7 +27,7 @@ index 20aec3da61..0499838caa 100644 # Set to false to disable all checks to https://grafana.com # for new versions of plugins. The check is used diff --git a/conf/sample.ini b/conf/sample.ini -index b57fe63f90..c7ac451c3e 100644 +index b5c2e2eae2..24e77d5233 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -196,7 +196,7 @@ @@ -57,12 +57,12 @@ index b57fe63f90..c7ac451c3e 100644 # Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json" ;default_home_dashboard_path = -@@ -1011,7 +1011,7 @@ +@@ -1026,7 +1026,7 @@ ;enable_alpha = false ;app_tls_skip_verify_insecure = false # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded. -;allow_loading_unsigned_plugins = -+allow_loading_unsigned_plugins = performancecopilot-pcp-app,pcp-redis-datasource,pcp-vector-datasource,pcp-bpftrace-datasource,pcp-flamegraph-panel,pcp-breadcrumbs-panel,pcp-troubleshooting-panel ++allow_loading_unsigned_plugins = performancecopilot-pcp-app,pcp-redis-datasource,pcp-vector-datasource,pcp-bpftrace-datasource,pcp-flamegraph-panel,pcp-breadcrumbs-panel,pcp-troubleshooting-panel,performancecopilot-redis-datasource,performancecopilot-vector-datasource,performancecopilot-bpftrace-datasource,performancecopilot-flamegraph-panel,performancecopilot-breadcrumbs-panel,performancecopilot-troubleshooting-panel # Enable or disable installing / uninstalling / updating plugins directly from within Grafana. ;plugin_admin_enabled = false ;plugin_admin_external_manage_enabled = false diff --git a/0005-remove-unused-backend-dependencies.patch b/0004-remove-unused-backend-dependencies.patch similarity index 62% rename from 0005-remove-unused-backend-dependencies.patch rename to 0004-remove-unused-backend-dependencies.patch index 8d613c1..493e3dc 100644 --- a/0005-remove-unused-backend-dependencies.patch +++ b/0004-remove-unused-backend-dependencies.patch @@ -1,4 +1,4 @@ -From e635efdd2f79a9da063618656b6bd3b296019e4f Mon Sep 17 00:00:00 2001 +From e4bd08496af62938c6ea99658ae6fd8619258447 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 22 Jun 2022 17:18:56 +0200 Subject: [PATCH] remove unused backend dependencies @@ -7,7 +7,7 @@ saml and gofpdf are not used in the OSS edition of Grafana after editing `pkg/extensions/main.go`, run `go mod tidy` diff --git a/go.mod b/go.mod -index de03aee2a9..000bc396c6 100644 +index 535c18fb68..56bb414bbe 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,6 @@ require ( @@ -16,47 +16,29 @@ index de03aee2a9..000bc396c6 100644 github.com/cortexproject/cortex v1.10.1-0.20211014125347-85c378182d0d - github.com/crewjam/saml v0.4.6-0.20210521115923-29c6295245bd github.com/davecgh/go-spew v1.1.1 - github.com/denisenkom/go-mssqldb v0.11.0 + github.com/denisenkom/go-mssqldb v0.12.0 github.com/dop251/goja v0.0.0-20210804101310-32956a348b49 @@ -63,7 +62,6 @@ require ( github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 github.com/jmespath/go-jmespath v0.4.0 github.com/json-iterator/go v1.1.12 - github.com/jung-kurt/gofpdf v1.16.2 - github.com/laher/mergefs v0.1.1 github.com/lib/pq v1.10.4 github.com/linkedin/goavro/v2 v2.10.0 -@@ -93,7 +91,7 @@ require ( - github.com/unknwon/com v1.0.1 - github.com/urfave/cli/v2 v2.3.0 - github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae -- github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78 -+ github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78 // indirect - github.com/xorcare/pointer v1.1.0 - github.com/yudai/gojsondiff v1.0.0 - go.opentelemetry.io/collector v0.31.0 -@@ -104,7 +102,7 @@ require ( - go.opentelemetry.io/otel/trace v1.2.0 - golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 - golang.org/x/exp v0.0.0-20210220032938-85be41e4509f -- golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 -+ golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 -@@ -200,7 +198,6 @@ require ( + github.com/m3db/prometheus_remote_client_golang v0.4.4 +@@ -191,7 +189,6 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect github.com/mattetti/filebuffer v1.0.1 // indirect - github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/miekg/dns v1.1.43 // indirect diff --git a/go.sum b/go.sum -index 25212ba552..fb540f96ea 100644 +index aa98e6bc0e..ced9bf3a15 100644 --- a/go.sum +++ b/go.sum -@@ -667,7 +667,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr +@@ -740,7 +740,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -64,7 +46,7 @@ index 25212ba552..fb540f96ea 100644 github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -@@ -692,7 +691,6 @@ github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2 +@@ -766,7 +765,6 @@ github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -72,7 +54,7 @@ index 25212ba552..fb540f96ea 100644 github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= -@@ -845,7 +843,6 @@ github.com/fluent/fluent-bit-go v0.0.0-20190925192703-ea13c021720c/go.mod h1:WQX +@@ -923,7 +921,6 @@ github.com/fluent/fluent-bit-go v0.0.0-20190925192703-ea13c021720c/go.mod h1:WQX github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -80,39 +62,16 @@ index 25212ba552..fb540f96ea 100644 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15/go.mod h1:tPg4cp4nseejPd+UKxtCVQ2hUxNTZ7qQZJa7CLriIeo= -@@ -868,7 +865,6 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo - github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= - github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= - github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= --github.com/getkin/kin-openapi v0.91.0 h1:mOSAljTAQONM0YVtI3+LvIQaa0zPwa3SH6UuiyEnbYQ= - github.com/getkin/kin-openapi v0.91.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= - github.com/getkin/kin-openapi v0.94.0 h1:bAxg2vxgnHHHoeefVdmGbR+oxtJlcv5HsJJa3qmAHuo= - github.com/getkin/kin-openapi v0.94.0/go.mod h1:LWZfzOd7PRy8GJ1dJ6mCU6tNdSfOwRac1BUPam4aw6Q= -@@ -1359,8 +1355,6 @@ github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f h1:FvvSVEbnGeM2bUivG - github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f/go.mod h1:uPG2nyK4CtgNDmWv7qyzYcdI+S90kHHRWvHnBtEMBXM= - github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 h1:GplhUk6Xes5JIhUUrggPcPBhOn+eT8+WsHiebvq7GgA= - github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= --github.com/grafana/grafana-aws-sdk v0.10.1 h1:Ksguhjx6EuGLN/5Oc7oZoxuDReJ5RxIH99yqSMpLGUs= --github.com/grafana/grafana-aws-sdk v0.10.1/go.mod h1:vFIOHEnY1u5nY0/tge1IHQjPuG6DRKr2ISf/HikUdjE= - github.com/grafana/grafana-aws-sdk v0.10.3 h1:nqjK8NfrUyUcAtSjGxnt17ZKjeOMCi62MNKFNagjG6g= - github.com/grafana/grafana-aws-sdk v0.10.3/go.mod h1:vFIOHEnY1u5nY0/tge1IHQjPuG6DRKr2ISf/HikUdjE= - github.com/grafana/grafana-azure-sdk-go v1.1.0 h1:Gh0fjs7jr4Lp5y+4cjn48U+MQaJeV8i9m1ds/1xszto= -@@ -1370,14 +1364,11 @@ github.com/grafana/grafana-google-sdk-go v0.0.0-20211104130251-b190293eaf58/go.m - github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW39s+c+LetqSCjFj7xxPC5+M= - github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk= - github.com/grafana/grafana-plugin-sdk-go v0.125.0/go.mod h1:9YiJ5GUxIsIEUC0qR9+BJVP5M7mCSP6uc6Ne62YKkgc= --github.com/grafana/grafana-plugin-sdk-go v0.129.0 h1:apmA8x59QvW5Wov+FhAfM0IiNGjMi8V2Ou7xyMk1leE= - github.com/grafana/grafana-plugin-sdk-go v0.129.0/go.mod h1:4edtosZepfQF9jkQwRywJsNSJzXTHmzbmcVcAl8MEQc= - github.com/grafana/grafana-plugin-sdk-go v0.131.0 h1:8M+Qfch4WNi3PPpRhWtmcLFTCq8zlIjnxrc8iRigAY0= - github.com/grafana/grafana-plugin-sdk-go v0.131.0/go.mod h1:jmrxelOJKrIK0yrsIzcotS8pbqPZozbmJgGy7k3hK1k= +@@ -1457,8 +1454,6 @@ github.com/grafana/grafana-plugin-sdk-go v0.138.0 h1:uJWNwHL4RoQF3axoi3RDSwoNu/K + github.com/grafana/grafana-plugin-sdk-go v0.138.0/go.mod h1:Y+Ps2sesZ62AyCnX+hzrYnyDQYe/ZZl+A8yKLOBm12c= github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa h1:+pXjAxavVR2FKKNsuuCXGCWEj8XGc1Af6SPiyBpzU2A= github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa/go.mod h1:0O8o/juxNSKN/e+DzWDTRkl7Zm8CkZcz0NDqEdojlrk= -github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b h1:YiSGp34F4V0G08HHx1cJBf2GVgwYAkXQjzuVs1t8jYk= -github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b/go.mod h1:q83kyQoMD0vhy+RzFLlbw0UgHJ6TAihQpuXvdFmm4s4= - github.com/grafana/sqlds/v2 v2.3.2/go.mod h1:34uyqPBWsEvg4V/xxh6V4uIqwu1qLfOfsmScll/ukrk= - github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= - github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -@@ -1634,7 +1625,6 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC + github.com/grafana/sqlds/v2 v2.3.7/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs= + github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751 h1:5PpsfN52XA0hxOjD/qQ0QNiEkp9Y9Tb+yz/Hj9fyL4M= + github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751/go.mod h1:KuqTKX9lfM87uu9vt9DS/q+REqSrAm2xYMnBBvlmevA= +@@ -1764,7 +1759,6 @@ github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52Cu github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -120,16 +79,16 @@ index 25212ba552..fb540f96ea 100644 github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/joncrlsn/dque v2.2.1-0.20200515025108-956d14155fa2+incompatible/go.mod h1:hDZb8oMj3Kp8MxtbNLg9vrtAUDHjgI1yZvqivT4O8Iw= -@@ -1669,8 +1659,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V +@@ -1799,8 +1793,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc= -github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= - github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= -@@ -1796,8 +1784,6 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef + github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo= +@@ -1928,8 +1920,6 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= @@ -138,7 +97,7 @@ index 25212ba552..fb540f96ea 100644 github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM= github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -@@ -2081,7 +2067,6 @@ github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHu +@@ -2237,7 +2227,6 @@ github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHu github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= @@ -146,27 +105,27 @@ index 25212ba552..fb540f96ea 100644 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -@@ -2272,7 +2257,6 @@ github.com/rs/cors v1.8.0 h1:P2KMzcFwrPoSjkF1WLRPsp3UMLyql8L4v9hQpVeK5so= - github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= - github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +@@ -2431,7 +2420,6 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= + github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= + github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/russellhaering/goxmldsig v1.1.0/go.mod h1:QK8GhXPB3+AfuCrfo0oRISa9NfzeCpWmxeGnqEpDF9o= github.com/russellhaering/goxmldsig v1.1.1 h1:vI0r2osGF1A9PLvsGdPUAGwEIrKa4Pj5sesSBsebIxM= github.com/russellhaering/goxmldsig v1.1.1/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -@@ -2569,7 +2553,6 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJB - github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +@@ -2745,7 +2733,6 @@ github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= + github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -github.com/zenazn/goji v1.0.1/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= diff --git a/pkg/extensions/main.go b/pkg/extensions/main.go -index 65fde07021..1a0367d221 100644 +index adcaff8ca6..c3110f590e 100644 --- a/pkg/extensions/main.go +++ b/pkg/extensions/main.go -@@ -12,7 +12,6 @@ import ( +@@ -9,7 +9,6 @@ import ( _ "github.com/Azure/go-autorest/autorest/adal" _ "github.com/beevik/etree" _ "github.com/cortexproject/cortex/pkg/util" @@ -174,7 +133,7 @@ index 65fde07021..1a0367d221 100644 _ "github.com/gobwas/glob" _ "github.com/googleapis/gax-go/v2" _ "github.com/grafana/dskit/backoff" -@@ -20,7 +19,6 @@ import ( +@@ -17,7 +16,6 @@ import ( _ "github.com/grafana/loki/clients/pkg/promtail/client" _ "github.com/grafana/loki/pkg/logproto" _ "github.com/grpc-ecosystem/go-grpc-middleware" diff --git a/0004-skip-goldenfiles-tests.patch b/0004-skip-goldenfiles-tests.patch deleted file mode 100644 index 8aa36ce..0000000 --- a/0004-skip-goldenfiles-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b9391de750cf2eca2cc30a43d90b21f7227772f0 Mon Sep 17 00:00:00 2001 -From: Andreas Gerstmayr -Date: Wed, 22 Jun 2022 17:11:53 +0200 -Subject: [PATCH] skip goldenfiles tests - -The golden files include memory dumps from a x86_64 machine. -Integers are stored as little endian on x86, but as big endian on s390x, -therefore loading this memory dump fails on s390x. - -diff --git a/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go b/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go -index f9de15cd11..42978397b9 100644 ---- a/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go -+++ b/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go -@@ -30,6 +30,10 @@ func CheckGoldenFrame(path string, f *data.Frame, updateFile bool) error { - // CheckGoldenDataResponse will verify that the stored file matches the given data.DataResponse - // when the updateFile flag is set, this will both add errors to the response and update the saved file - func CheckGoldenDataResponse(path string, dr *backend.DataResponse, updateFile bool) error { -+ println("skipping test: x86_64 memory dump is not compatible with other architectures") -+ if true { -+ return nil -+ } - saved, err := readGoldenFile(path) - - if err != nil { diff --git a/0006-remove-unused-frontend-crypto.patch b/0005-remove-unused-frontend-crypto.patch similarity index 89% rename from 0006-remove-unused-frontend-crypto.patch rename to 0005-remove-unused-frontend-crypto.patch index d4852d7..12b0462 100644 --- a/0006-remove-unused-frontend-crypto.patch +++ b/0005-remove-unused-frontend-crypto.patch @@ -1,4 +1,4 @@ -From feb6e3e3e7f5c95b4822625cef745b71b263117b Mon Sep 17 00:00:00 2001 +From 57cc28e1783315f311b7946d2e60c41c6590f349 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 22 Jun 2022 17:36:47 +0200 Subject: [PATCH] remove unused frontend crypto @@ -7,24 +7,24 @@ update `package.json` and then run `yarn install` to update the `yarn.lock` lockfile diff --git a/package.json b/package.json -index 2f7baca3dd..190feff8a4 100644 +index fc77a1a3c0..195dcd4756 100644 --- a/package.json +++ b/package.json -@@ -391,6 +391,9 @@ +@@ -396,6 +396,9 @@ "whatwg-fetch": "3.6.2" }, "resolutions": { + "crypto-browserify": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz", + "selfsigned": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz", + "http-signature": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz", - "underscore": "1.13.2", + "underscore": "1.13.3", "@types/slate": "0.47.2", - "@microsoft/api-extractor-model": "7.16.0", + "@microsoft/api-extractor-model": "7.17.3", diff --git a/yarn.lock b/yarn.lock -index 71952b9f8d..cc3e1b89f8 100644 +index aac4c30c27..8ae68abaab 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -12985,34 +12985,6 @@ __metadata: +@@ -12284,34 +12284,6 @@ __metadata: languageName: node linkType: hard @@ -59,7 +59,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "assert@npm:2.0.0": version: 2.0.0 resolution: "assert@npm:2.0.0" -@@ -13672,15 +13644,6 @@ __metadata: +@@ -12898,15 +12870,6 @@ __metadata: languageName: node linkType: hard @@ -75,7 +75,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "before-after-hook@npm:^2.2.0": version: 2.2.2 resolution: "before-after-hook@npm:2.2.2" -@@ -13779,20 +13742,6 @@ __metadata: +@@ -12998,20 +12961,6 @@ __metadata: languageName: node linkType: hard @@ -96,7 +96,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "body-parser@npm:1.19.0": version: 1.19.0 resolution: "body-parser@npm:1.19.0" -@@ -13892,13 +13841,6 @@ __metadata: +@@ -13136,13 +13085,6 @@ __metadata: languageName: node linkType: hard @@ -110,7 +110,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "browser-process-hrtime@npm:^1.0.0": version: 1.0.0 resolution: "browser-process-hrtime@npm:1.0.0" -@@ -13913,70 +13855,6 @@ __metadata: +@@ -13157,70 +13099,6 @@ __metadata: languageName: node linkType: hard @@ -181,7 +181,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "browserify-zlib@npm:^0.2.0": version: 0.2.0 resolution: "browserify-zlib@npm:0.2.0" -@@ -14070,13 +13948,6 @@ __metadata: +@@ -13322,13 +13200,6 @@ __metadata: languageName: node linkType: hard @@ -195,7 +195,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "buffer@npm:^4.3.0": version: 4.9.2 resolution: "buffer@npm:4.9.2" -@@ -14726,16 +14597,6 @@ __metadata: +@@ -13924,16 +13795,6 @@ __metadata: languageName: node linkType: hard @@ -209,10 +209,10 @@ index 71952b9f8d..cc3e1b89f8 100644 - languageName: node - linkType: hard - - "cjs-module-lexer@npm:^0.6.0": - version: 0.6.0 - resolution: "cjs-module-lexer@npm:0.6.0" -@@ -15675,13 +15536,6 @@ __metadata: + "cjs-module-lexer@npm:^1.0.0": + version: 1.2.2 + resolution: "cjs-module-lexer@npm:1.2.2" +@@ -14834,13 +14695,6 @@ __metadata: languageName: node linkType: hard @@ -226,7 +226,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "core-util-is@npm:~1.0.0": version: 1.0.3 resolution: "core-util-is@npm:1.0.3" -@@ -15763,16 +15617,6 @@ __metadata: +@@ -14910,16 +14764,6 @@ __metadata: languageName: node linkType: hard @@ -243,7 +243,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "create-emotion@npm:^10.0.14, create-emotion@npm:^10.0.27": version: 10.0.27 resolution: "create-emotion@npm:10.0.27" -@@ -15785,33 +15629,6 @@ __metadata: +@@ -14932,33 +14776,6 @@ __metadata: languageName: node linkType: hard @@ -277,7 +277,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "create-require@npm:^1.1.0": version: 1.1.1 resolution: "create-require@npm:1.1.1" -@@ -15843,22 +15660,10 @@ __metadata: +@@ -14990,22 +14807,10 @@ __metadata: languageName: node linkType: hard @@ -304,7 +304,7 @@ index 71952b9f8d..cc3e1b89f8 100644 languageName: node linkType: hard -@@ -16862,15 +16667,6 @@ __metadata: +@@ -15956,15 +15761,6 @@ __metadata: languageName: node linkType: hard @@ -317,10 +317,10 @@ index 71952b9f8d..cc3e1b89f8 100644 - languageName: node - linkType: hard - - "data-urls@npm:^1.1.0": - version: 1.1.0 - resolution: "data-urls@npm:1.1.0" -@@ -17226,16 +17022,6 @@ __metadata: + "data-urls@npm:^2.0.0": + version: 2.0.0 + resolution: "data-urls@npm:2.0.0" +@@ -16279,16 +16075,6 @@ __metadata: languageName: node linkType: hard @@ -337,7 +337,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "destroy@npm:~1.0.4": version: 1.0.4 resolution: "destroy@npm:1.0.4" -@@ -17372,17 +17158,6 @@ __metadata: +@@ -16425,17 +16211,6 @@ __metadata: languageName: node linkType: hard @@ -352,10 +352,10 @@ index 71952b9f8d..cc3e1b89f8 100644 - languageName: node - linkType: hard - - "dir-glob@npm:^2.0.0, dir-glob@npm:^2.2.2": + "dir-glob@npm:^2.2.2": version: 2.2.2 resolution: "dir-glob@npm:2.2.2" -@@ -17688,16 +17463,6 @@ __metadata: +@@ -16722,16 +16497,6 @@ __metadata: languageName: node linkType: hard @@ -372,7 +372,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "ee-first@npm:1.1.1": version: 1.1.1 resolution: "ee-first@npm:1.1.1" -@@ -17735,21 +17500,6 @@ __metadata: +@@ -16776,21 +16541,6 @@ __metadata: languageName: node linkType: hard @@ -394,7 +394,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "emitter-component@npm:^1.1.1": version: 1.1.1 resolution: "emitter-component@npm:1.1.1" -@@ -18828,17 +18578,6 @@ __metadata: +@@ -17744,17 +17494,6 @@ __metadata: languageName: node linkType: hard @@ -412,7 +412,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "exec-sh@npm:^0.3.2": version: 0.3.6 resolution: "exec-sh@npm:0.3.6" -@@ -19094,20 +18833,6 @@ __metadata: +@@ -18034,20 +17773,6 @@ __metadata: languageName: node linkType: hard @@ -433,7 +433,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "fast-deep-equal@npm:^3.0.0, fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" -@@ -20151,15 +19876,6 @@ __metadata: +@@ -19084,15 +18809,6 @@ __metadata: languageName: node linkType: hard @@ -449,7 +449,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "git-raw-commits@npm:^2.0.8": version: 2.0.10 resolution: "git-raw-commits@npm:2.0.10" -@@ -21012,27 +20728,6 @@ __metadata: +@@ -19925,27 +19641,6 @@ __metadata: languageName: node linkType: hard @@ -477,7 +477,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "hast-to-hyperscript@npm:^9.0.0": version: 9.0.1 resolution: "hast-to-hyperscript@npm:9.0.1" -@@ -21168,17 +20863,6 @@ __metadata: +@@ -20081,17 +19776,6 @@ __metadata: languageName: node linkType: hard @@ -495,7 +495,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "hoist-non-react-statics@npm:3.3.2, hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" -@@ -21555,25 +21239,10 @@ __metadata: +@@ -20432,25 +20116,10 @@ __metadata: languageName: node linkType: hard @@ -525,7 +525,7 @@ index 71952b9f8d..cc3e1b89f8 100644 languageName: node linkType: hard -@@ -24306,13 +23975,6 @@ __metadata: +@@ -22600,13 +22269,6 @@ __metadata: languageName: node linkType: hard @@ -536,10 +536,10 @@ index 71952b9f8d..cc3e1b89f8 100644 - languageName: node - linkType: hard - - "jsdoc-type-pratt-parser@npm:~2.2.2": - version: 2.2.2 - resolution: "jsdoc-type-pratt-parser@npm:2.2.2" -@@ -24466,20 +24128,6 @@ __metadata: + "jsdoc-type-pratt-parser@npm:~2.2.5": + version: 2.2.5 + resolution: "jsdoc-type-pratt-parser@npm:2.2.5" +@@ -22721,20 +22383,6 @@ __metadata: languageName: node linkType: hard @@ -560,7 +560,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "json-source-map@npm:0.6.1": version: 0.6.1 resolution: "json-source-map@npm:0.6.1" -@@ -24583,30 +24231,6 @@ __metadata: +@@ -22838,30 +22486,6 @@ __metadata: languageName: node linkType: hard @@ -591,7 +591,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "jsurl@npm:^0.1.5": version: 0.1.5 resolution: "jsurl@npm:0.1.5" -@@ -25645,17 +25269,6 @@ __metadata: +@@ -23863,17 +23487,6 @@ __metadata: languageName: node linkType: hard @@ -609,7 +609,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "mdast-squeeze-paragraphs@npm:^4.0.0": version: 4.0.0 resolution: "mdast-squeeze-paragraphs@npm:4.0.0" -@@ -25925,18 +25538,6 @@ __metadata: +@@ -24153,18 +23766,6 @@ __metadata: languageName: node linkType: hard @@ -628,7 +628,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "mime-db@npm:1.50.0, mime-db@npm:>= 1.43.0 < 2": version: 1.50.0 resolution: "mime-db@npm:1.50.0" -@@ -26087,20 +25688,13 @@ __metadata: +@@ -24292,20 +23893,13 @@ __metadata: languageName: node linkType: hard @@ -650,21 +650,21 @@ index 71952b9f8d..cc3e1b89f8 100644 "minimatch@npm:3.0.4, minimatch@npm:^3.0.4": version: 3.0.4 resolution: "minimatch@npm:3.0.4" -@@ -26751,13 +26345,6 @@ __metadata: +@@ -24948,13 +24542,6 @@ __metadata: languageName: node linkType: hard --"node-forge@npm:^1.2.0": -- version: 1.3.0 -- resolution: "node-forge@npm:1.3.0" -- checksum: 3d8124168dd82006fafbb079f40a529afa0de5bf4d77e6a5a471877e9d39bece31fdc8339e8aee30d5480dc79ffcd1059cfcb21983d350dd3f2a9f226db6ca85 +-"node-forge@npm:^1": +- version: 1.3.1 +- resolution: "node-forge@npm:1.3.1" +- checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9 - languageName: node - linkType: hard - "node-gettext@npm:^3.0.0": version: 3.0.0 resolution: "node-gettext@npm:3.0.0" -@@ -27936,19 +27523,6 @@ __metadata: +@@ -26069,19 +25656,6 @@ __metadata: languageName: node linkType: hard @@ -684,7 +684,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "parse-entities@npm:^2.0.0": version: 2.0.0 resolution: "parse-entities@npm:2.0.0" -@@ -28177,19 +27751,6 @@ __metadata: +@@ -26303,19 +25877,6 @@ __metadata: languageName: node linkType: hard @@ -704,7 +704,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "pend@npm:~1.2.0": version: 1.2.0 resolution: "pend@npm:1.2.0" -@@ -29976,20 +29537,6 @@ __metadata: +@@ -28004,20 +27565,6 @@ __metadata: languageName: node linkType: hard @@ -725,7 +725,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "pump@npm:^2.0.0": version: 2.0.1 resolution: "pump@npm:2.0.1" -@@ -30201,7 +29748,7 @@ __metadata: +@@ -28226,7 +27773,7 @@ __metadata: languageName: node linkType: hard @@ -734,7 +734,7 @@ index 71952b9f8d..cc3e1b89f8 100644 version: 2.1.0 resolution: "randombytes@npm:2.1.0" dependencies: -@@ -30210,16 +29757,6 @@ __metadata: +@@ -28235,16 +27782,6 @@ __metadata: languageName: node linkType: hard @@ -751,7 +751,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1": version: 1.2.1 resolution: "range-parser@npm:1.2.1" -@@ -32451,16 +31988,6 @@ __metadata: +@@ -30488,16 +30025,6 @@ __metadata: languageName: node linkType: hard @@ -768,16 +768,16 @@ index 71952b9f8d..cc3e1b89f8 100644 "rollup-plugin-copy@npm:3.4.0": version: 3.4.0 resolution: "rollup-plugin-copy@npm:3.4.0" -@@ -32635,7 +32162,7 @@ __metadata: +@@ -30683,7 +30210,7 @@ __metadata: languageName: node linkType: hard --"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": -+"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": +-"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": ++"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 -@@ -32651,7 +32178,7 @@ __metadata: +@@ -30699,7 +30226,7 @@ __metadata: languageName: node linkType: hard @@ -786,16 +786,16 @@ index 71952b9f8d..cc3e1b89f8 100644 version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0 -@@ -32888,12 +32415,10 @@ __metadata: +@@ -30936,12 +30463,10 @@ __metadata: languageName: node linkType: hard --"selfsigned@npm:^2.0.0": -- version: 2.0.0 -- resolution: "selfsigned@npm:2.0.0" +-"selfsigned@npm:^2.0.1": +- version: 2.0.1 +- resolution: "selfsigned@npm:2.0.1" - dependencies: -- node-forge: ^1.2.0 -- checksum: 43fca39a5aded2a8e97c1756af74c049a9dde12d47d302820f7d507d25c2ad7da4b04bc439a36620d63b4c0149bcf34ae7a729f978bf3b1bf48859c36ae34cee +- node-forge: ^1 +- checksum: 864e65c2f31ca877bce3ccdaa3bdef5e1e992b63b2a03641e00c24cd305bf2acce093431d1fed2e5ae9f526558db4be5e90baa2b3474c0428fcf7e25cc86ac93 +"selfsigned@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz": + version: 1.1.3 + resolution: "selfsigned@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz" @@ -803,7 +803,7 @@ index 71952b9f8d..cc3e1b89f8 100644 languageName: node linkType: hard -@@ -33088,18 +32613,6 @@ __metadata: +@@ -31178,18 +30703,6 @@ __metadata: languageName: node linkType: hard @@ -822,7 +822,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "shallow-clone@npm:^3.0.0": version: 3.0.1 resolution: "shallow-clone@npm:3.0.1" -@@ -33781,27 +33294,6 @@ __metadata: +@@ -31837,27 +31350,6 @@ __metadata: languageName: node linkType: hard @@ -850,7 +850,7 @@ index 71952b9f8d..cc3e1b89f8 100644 "ssri@npm:^6.0.1": version: 6.0.2 resolution: "ssri@npm:6.0.2" -@@ -35627,13 +35119,6 @@ __metadata: +@@ -33516,13 +33008,6 @@ __metadata: languageName: node linkType: hard @@ -864,9 +864,9 @@ index 71952b9f8d..cc3e1b89f8 100644 "type-check@npm:^0.4.0, type-check@npm:~0.4.0": version: 0.4.0 resolution: "type-check@npm:0.4.0" -@@ -36562,17 +36047,6 @@ __metadata: +@@ -34336,17 +33821,6 @@ __metadata: languageName: node - linkType: hard + linkType: soft -"verror@npm:1.10.0": - version: 1.10.0 diff --git a/0009-notifications-use-HMAC-SHA256-to-generate-password-r.patch b/0006-notifications-use-HMAC-SHA256-to-generate-password-r.patch similarity index 98% rename from 0009-notifications-use-HMAC-SHA256-to-generate-password-r.patch rename to 0006-notifications-use-HMAC-SHA256-to-generate-password-r.patch index 7f01012..b872f7b 100644 --- a/0009-notifications-use-HMAC-SHA256-to-generate-password-r.patch +++ b/0006-notifications-use-HMAC-SHA256-to-generate-password-r.patch @@ -1,4 +1,4 @@ -From 5e52091cac47997168f1a142dee2b07e3a97f02b Mon Sep 17 00:00:00 2001 +From c69e745541cf3d98e6d605dec3848c28b2541bbd Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Thu, 25 Nov 2021 18:49:52 +0100 Subject: [PATCH] notifications: use HMAC-SHA256 to generate password reset @@ -313,7 +313,7 @@ index 7c86ebb834..653ac01c45 100644 return err } diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go -index 0244c7df55..dd3451d70d 100644 +index 71970e20a0..6f4b318fe0 100644 --- a/pkg/services/notifications/notifications_test.go +++ b/pkg/services/notifications/notifications_test.go @@ -2,6 +2,7 @@ package notifications @@ -324,7 +324,7 @@ index 0244c7df55..dd3451d70d 100644 "testing" "github.com/grafana/grafana/pkg/bus" -@@ -177,7 +178,8 @@ func TestSendEmailAsync(t *testing.T) { +@@ -185,7 +186,8 @@ func TestSendEmailAsync(t *testing.T) { t.Run("When sending reset email password", func(t *testing.T) { sut, _ := createSut(t, bus) @@ -334,7 +334,7 @@ index 0244c7df55..dd3451d70d 100644 require.NoError(t, err) sentMsg := <-sut.mailQueue -@@ -186,6 +188,21 @@ func TestSendEmailAsync(t *testing.T) { +@@ -194,6 +196,21 @@ func TestSendEmailAsync(t *testing.T) { assert.Equal(t, "Reset your Grafana password - asd@asd.com", sentMsg.Subject) assert.NotContains(t, sentMsg.Body["text/html"], "Subject") assert.NotContains(t, sentMsg.Body["text/plain"], "Subject") diff --git a/0010-disable-husky-git-hook.patch b/0007-disable-husky-git-hook.patch similarity index 80% rename from 0010-disable-husky-git-hook.patch rename to 0007-disable-husky-git-hook.patch index f269309..76f439f 100644 --- a/0010-disable-husky-git-hook.patch +++ b/0007-disable-husky-git-hook.patch @@ -1,11 +1,11 @@ -From 302bb86624d894c2b86193a6717c6b5babbe0dab Mon Sep 17 00:00:00 2001 +From 41629934d99471b8392dc649bf7338ad6405de56 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 22 Jun 2022 18:29:42 +0200 Subject: [PATCH] disable husky git hook diff --git a/package.json b/package.json -index 190feff8a4..6aff0c7a0f 100644 +index 195dcd4756..97b8988ffe 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ @@ -14,5 +14,5 @@ index 190feff8a4..6aff0c7a0f 100644 "i18n:compile": "lingui compile", - "postinstall": "husky install", "betterer": "betterer", + "betterer:merge": "betterer merge", "betterer:stats": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/reportBettererStats.ts" - }, diff --git a/0007-patch-removed-backend-crypto.patch b/0007-patch-removed-backend-crypto.patch deleted file mode 100644 index 9299e22..0000000 --- a/0007-patch-removed-backend-crypto.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 72edc2320aaa72ff562a0ea50ce4daa42bbabd2e Mon Sep 17 00:00:00 2001 -From: Andreas Gerstmayr -Date: Wed, 22 Jun 2022 17:42:30 +0200 -Subject: [PATCH] patch removed backend crypto - -the `Makefile` removed a few files containing (unused) crypto -algorithms from the vendor tarball, which are not used in Grafana. -This patch removes all references to the deleted files. - -diff --git a/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go b/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go -new file mode 100644 -index 0000000000..871e612a61 ---- /dev/null -+++ b/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go -@@ -0,0 +1,25 @@ -+package elgamal -+ -+import ( -+ "io" -+ "math/big" -+) -+ -+// PublicKey represents an ElGamal public key. -+type PublicKey struct { -+ G, P, Y *big.Int -+} -+ -+// PrivateKey represents an ElGamal private key. -+type PrivateKey struct { -+ PublicKey -+ X *big.Int -+} -+ -+func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int, err error) { -+ panic("ElGamal encryption not available") -+} -+ -+func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) { -+ panic("ElGamal encryption not available") -+} -diff --git a/vendor/golang.org/x/crypto/openpgp/packet/packet.go b/vendor/golang.org/x/crypto/openpgp/packet/packet.go -index 0a19794a8e..25a5ee9158 100644 ---- a/vendor/golang.org/x/crypto/openpgp/packet/packet.go -+++ b/vendor/golang.org/x/crypto/openpgp/packet/packet.go -@@ -22,7 +22,6 @@ import ( - "math/big" - "math/bits" - -- "golang.org/x/crypto/cast5" - "golang.org/x/crypto/openpgp/errors" - ) - -@@ -493,7 +492,7 @@ func (cipher CipherFunction) KeySize() int { - case Cipher3DES: - return 24 - case CipherCAST5: -- return cast5.KeySize -+ panic("cast5 cipher not available") - case CipherAES128: - return 16 - case CipherAES192: -@@ -523,7 +522,7 @@ func (cipher CipherFunction) new(key []byte) (block cipher.Block) { - case Cipher3DES: - block, _ = des.NewTripleDESCipher(key) - case CipherCAST5: -- block, _ = cast5.NewCipher(key) -+ panic("cast5 cipher not available") - case CipherAES128, CipherAES192, CipherAES256: - block, _ = aes.NewCipher(key) - } -diff --git a/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go b/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go -index 6126030eb9..3a54c5f2b1 100644 ---- a/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go -+++ b/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go -@@ -5,13 +5,12 @@ - package packet - - import ( -- "crypto/cipher" - "crypto/sha1" - "crypto/subtle" -- "golang.org/x/crypto/openpgp/errors" - "hash" - "io" -- "strconv" -+ -+ "golang.org/x/crypto/openpgp/errors" - ) - - // SymmetricallyEncrypted represents a symmetrically encrypted byte string. The -@@ -45,46 +44,7 @@ func (se *SymmetricallyEncrypted) parse(r io.Reader) error { - // packet can be read. An incorrect key can, with high probability, be detected - // immediately and this will result in a KeyIncorrect error being returned. - func (se *SymmetricallyEncrypted) Decrypt(c CipherFunction, key []byte) (io.ReadCloser, error) { -- keySize := c.KeySize() -- if keySize == 0 { -- return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(c))) -- } -- if len(key) != keySize { -- return nil, errors.InvalidArgumentError("SymmetricallyEncrypted: incorrect key length") -- } -- -- if se.prefix == nil { -- se.prefix = make([]byte, c.blockSize()+2) -- _, err := readFull(se.contents, se.prefix) -- if err != nil { -- return nil, err -- } -- } else if len(se.prefix) != c.blockSize()+2 { -- return nil, errors.InvalidArgumentError("can't try ciphers with different block lengths") -- } -- -- ocfbResync := OCFBResync -- if se.MDC { -- // MDC packets use a different form of OCFB mode. -- ocfbResync = OCFBNoResync -- } -- -- s := NewOCFBDecrypter(c.new(key), se.prefix, ocfbResync) -- if s == nil { -- return nil, errors.ErrKeyIncorrect -- } -- -- plaintext := cipher.StreamReader{S: s, R: se.contents} -- -- if se.MDC { -- // MDC packets have an embedded hash that we need to check. -- h := sha1.New() -- h.Write(se.prefix) -- return &seMDCReader{in: plaintext, h: h}, nil -- } -- -- // Otherwise, we just need to wrap plaintext so that it's a valid ReadCloser. -- return seReader{plaintext}, nil -+ panic("OCFB cipher not available") - } - - // seReader wraps an io.Reader with a no-op Close method. -@@ -254,37 +214,5 @@ func (c noOpCloser) Close() error { - // written. - // If config is nil, sensible defaults will be used. - func SerializeSymmetricallyEncrypted(w io.Writer, c CipherFunction, key []byte, config *Config) (contents io.WriteCloser, err error) { -- if c.KeySize() != len(key) { -- return nil, errors.InvalidArgumentError("SymmetricallyEncrypted.Serialize: bad key length") -- } -- writeCloser := noOpCloser{w} -- ciphertext, err := serializeStreamHeader(writeCloser, packetTypeSymmetricallyEncryptedMDC) -- if err != nil { -- return -- } -- -- _, err = ciphertext.Write([]byte{symmetricallyEncryptedVersion}) -- if err != nil { -- return -- } -- -- block := c.new(key) -- blockSize := block.BlockSize() -- iv := make([]byte, blockSize) -- _, err = config.Random().Read(iv) -- if err != nil { -- return -- } -- s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync) -- _, err = ciphertext.Write(prefix) -- if err != nil { -- return -- } -- plaintext := cipher.StreamWriter{S: s, W: ciphertext} -- -- h := sha1.New() -- h.Write(iv) -- h.Write(iv[blockSize-2:]) -- contents = &seMDCWriter{w: plaintext, h: h} -- return -+ panic("OCFB cipher not available") - } diff --git a/0011-skip-marketplace-plugin-install-test.patch b/0008-skip-marketplace-plugin-install-test.patch similarity index 90% rename from 0011-skip-marketplace-plugin-install-test.patch rename to 0008-skip-marketplace-plugin-install-test.patch index 0a5d924..830daac 100644 --- a/0011-skip-marketplace-plugin-install-test.patch +++ b/0008-skip-marketplace-plugin-install-test.patch @@ -1,4 +1,4 @@ -From fc4d268499efbfe5a9598c2e7189cb22cd5432b6 Mon Sep 17 00:00:00 2001 +From 8e6f5cf56fba46422fc9a3fa0381924b186194a3 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Thu, 23 Jun 2022 17:00:46 +0200 Subject: [PATCH] skip marketplace plugin install test @@ -8,7 +8,7 @@ Network connectivity is disabled in the build environment for security reasons, therefore we need to disable this test. diff --git a/pkg/tests/api/plugins/api_plugins_test.go b/pkg/tests/api/plugins/api_plugins_test.go -index bf44d6202f..bc87cd6338 100644 +index e86ce50830..fd60fbe67c 100644 --- a/pkg/tests/api/plugins/api_plugins_test.go +++ b/pkg/tests/api/plugins/api_plugins_test.go @@ -55,6 +55,7 @@ func TestPlugins(t *testing.T) { diff --git a/0012-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch b/0009-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch similarity index 59% rename from 0012-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch rename to 0009-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch index caa7ba2..4ebd2bc 100644 --- a/0012-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch +++ b/0009-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch @@ -1,15 +1,15 @@ -From 88c0f13fd94eaf08d707aefde3c3b1a233f39290 Mon Sep 17 00:00:00 2001 +From fda7918ed1718ec3e6602613fad25ab1435a1b47 Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Mon, 27 Jun 2022 17:12:27 +0200 Subject: [PATCH] Prometheus: Fix integer overflow in rate interval calculation on 32-bit architectures -diff --git a/pkg/tsdb/prometheus/time_series_query.go b/pkg/tsdb/prometheus/time_series_query.go -index d768738d8a..ee98264a31 100644 ---- a/pkg/tsdb/prometheus/time_series_query.go -+++ b/pkg/tsdb/prometheus/time_series_query.go -@@ -285,7 +285,7 @@ func calculateRateInterval(interval time.Duration, scrapeInterval string, interv +diff --git a/pkg/tsdb/prometheus/buffered/time_series_query.go b/pkg/tsdb/prometheus/buffered/time_series_query.go +index 40db2d9100..0af2d3ecab 100644 +--- a/pkg/tsdb/prometheus/buffered/time_series_query.go ++++ b/pkg/tsdb/prometheus/buffered/time_series_query.go +@@ -326,7 +326,7 @@ func calculateRateInterval(interval time.Duration, scrapeInterval string, interv return time.Duration(0) } diff --git a/0010-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch b/0010-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch new file mode 100644 index 0000000..b1dc0c7 --- /dev/null +++ b/0010-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch @@ -0,0 +1,20 @@ +From 22ea44e0867420bc7eb2ecf96e8d0b8e87dd7328 Mon Sep 17 00:00:00 2001 +From: Andreas Gerstmayr +Date: Tue, 5 Jul 2022 17:04:13 +0200 +Subject: [PATCH] Prometheus: Fix integer overflow in rate interval calculation + on 32-bit architectures 2 + + +diff --git a/pkg/tsdb/prometheus/models/query.go b/pkg/tsdb/prometheus/models/query.go +index bdd48d08ed..aa2b1f9945 100644 +--- a/pkg/tsdb/prometheus/models/query.go ++++ b/pkg/tsdb/prometheus/models/query.go +@@ -181,7 +181,7 @@ func calculateRateInterval(interval time.Duration, scrapeInterval string, interv + return time.Duration(0) + } + +- rateInterval := time.Duration(int(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration)))) ++ rateInterval := time.Duration(int64(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration)))) + return rateInterval + } + diff --git a/1001-vendor-patch-removed-backend-crypto.patch b/1001-vendor-patch-removed-backend-crypto.patch new file mode 100644 index 0000000..383b6e2 --- /dev/null +++ b/1001-vendor-patch-removed-backend-crypto.patch @@ -0,0 +1,427 @@ +patch removed backend crypto + +the `Makefile` removed a few files containing (unused) crypto +algorithms from the vendor tarball, which are not used in Grafana. +This patch removes all references to the deleted files. + +diff --git a/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go b/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go +new file mode 100644 +index 0000000000..871e612a61 +--- /dev/null ++++ b/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go +@@ -0,0 +1,25 @@ ++package elgamal ++ ++import ( ++ "io" ++ "math/big" ++) ++ ++// PublicKey represents an ElGamal public key. ++type PublicKey struct { ++ G, P, Y *big.Int ++} ++ ++// PrivateKey represents an ElGamal private key. ++type PrivateKey struct { ++ PublicKey ++ X *big.Int ++} ++ ++func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int, err error) { ++ panic("ElGamal encryption not available") ++} ++ ++func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) { ++ panic("ElGamal encryption not available") ++} +diff --git a/vendor/golang.org/x/crypto/openpgp/packet/packet.go b/vendor/golang.org/x/crypto/openpgp/packet/packet.go +index 0a19794a8e..25a5ee9158 100644 +--- a/vendor/golang.org/x/crypto/openpgp/packet/packet.go ++++ b/vendor/golang.org/x/crypto/openpgp/packet/packet.go +@@ -22,7 +22,6 @@ import ( + "math/big" + "math/bits" + +- "golang.org/x/crypto/cast5" + "golang.org/x/crypto/openpgp/errors" + ) + +@@ -493,7 +492,7 @@ func (cipher CipherFunction) KeySize() int { + case Cipher3DES: + return 24 + case CipherCAST5: +- return cast5.KeySize ++ panic("cast5 cipher not available") + case CipherAES128: + return 16 + case CipherAES192: +@@ -523,7 +522,7 @@ func (cipher CipherFunction) new(key []byte) (block cipher.Block) { + case Cipher3DES: + block, _ = des.NewTripleDESCipher(key) + case CipherCAST5: +- block, _ = cast5.NewCipher(key) ++ panic("cast5 cipher not available") + case CipherAES128, CipherAES192, CipherAES256: + block, _ = aes.NewCipher(key) + } +diff --git a/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go b/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go +index 6126030eb9..3a54c5f2b1 100644 +--- a/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go ++++ b/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go +@@ -5,13 +5,12 @@ + package packet + + import ( +- "crypto/cipher" + "crypto/sha1" + "crypto/subtle" +- "golang.org/x/crypto/openpgp/errors" + "hash" + "io" +- "strconv" ++ ++ "golang.org/x/crypto/openpgp/errors" + ) + + // SymmetricallyEncrypted represents a symmetrically encrypted byte string. The +@@ -45,46 +44,7 @@ func (se *SymmetricallyEncrypted) parse(r io.Reader) error { + // packet can be read. An incorrect key can, with high probability, be detected + // immediately and this will result in a KeyIncorrect error being returned. + func (se *SymmetricallyEncrypted) Decrypt(c CipherFunction, key []byte) (io.ReadCloser, error) { +- keySize := c.KeySize() +- if keySize == 0 { +- return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(c))) +- } +- if len(key) != keySize { +- return nil, errors.InvalidArgumentError("SymmetricallyEncrypted: incorrect key length") +- } +- +- if se.prefix == nil { +- se.prefix = make([]byte, c.blockSize()+2) +- _, err := readFull(se.contents, se.prefix) +- if err != nil { +- return nil, err +- } +- } else if len(se.prefix) != c.blockSize()+2 { +- return nil, errors.InvalidArgumentError("can't try ciphers with different block lengths") +- } +- +- ocfbResync := OCFBResync +- if se.MDC { +- // MDC packets use a different form of OCFB mode. +- ocfbResync = OCFBNoResync +- } +- +- s := NewOCFBDecrypter(c.new(key), se.prefix, ocfbResync) +- if s == nil { +- return nil, errors.ErrKeyIncorrect +- } +- +- plaintext := cipher.StreamReader{S: s, R: se.contents} +- +- if se.MDC { +- // MDC packets have an embedded hash that we need to check. +- h := sha1.New() +- h.Write(se.prefix) +- return &seMDCReader{in: plaintext, h: h}, nil +- } +- +- // Otherwise, we just need to wrap plaintext so that it's a valid ReadCloser. +- return seReader{plaintext}, nil ++ panic("OCFB cipher not available") + } + + // seReader wraps an io.Reader with a no-op Close method. +@@ -254,37 +214,5 @@ func (c noOpCloser) Close() error { + // written. + // If config is nil, sensible defaults will be used. + func SerializeSymmetricallyEncrypted(w io.Writer, c CipherFunction, key []byte, config *Config) (contents io.WriteCloser, err error) { +- if c.KeySize() != len(key) { +- return nil, errors.InvalidArgumentError("SymmetricallyEncrypted.Serialize: bad key length") +- } +- writeCloser := noOpCloser{w} +- ciphertext, err := serializeStreamHeader(writeCloser, packetTypeSymmetricallyEncryptedMDC) +- if err != nil { +- return +- } +- +- _, err = ciphertext.Write([]byte{symmetricallyEncryptedVersion}) +- if err != nil { +- return +- } +- +- block := c.new(key) +- blockSize := block.BlockSize() +- iv := make([]byte, blockSize) +- _, err = config.Random().Read(iv) +- if err != nil { +- return +- } +- s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync) +- _, err = ciphertext.Write(prefix) +- if err != nil { +- return +- } +- plaintext := cipher.StreamWriter{S: s, W: ciphertext} +- +- h := sha1.New() +- h.Write(iv) +- h.Write(iv[blockSize-2:]) +- contents = &seMDCWriter{w: plaintext, h: h} +- return ++ panic("OCFB cipher not available") + } +diff --git a/vendor/golang.org/x/crypto/pkcs12/crypto.go b/vendor/golang.org/x/crypto/pkcs12/crypto.go +index 484ca51b71..5f502b8df1 100644 +--- a/vendor/golang.org/x/crypto/pkcs12/crypto.go ++++ b/vendor/golang.org/x/crypto/pkcs12/crypto.go +@@ -11,8 +11,6 @@ import ( + "crypto/x509/pkix" + "encoding/asn1" + "errors" +- +- "golang.org/x/crypto/pkcs12/internal/rc2" + ) + + var ( +@@ -46,10 +44,6 @@ func (shaWithTripleDESCBC) deriveIV(salt, password []byte, iterations int) []byt + + type shaWith40BitRC2CBC struct{} + +-func (shaWith40BitRC2CBC) create(key []byte) (cipher.Block, error) { +- return rc2.New(key, len(key)*8) +-} +- + func (shaWith40BitRC2CBC) deriveKey(salt, password []byte, iterations int) []byte { + return pbkdf(sha1Sum, 20, 64, salt, password, iterations, 1, 5) + } +@@ -70,7 +64,7 @@ func pbDecrypterFor(algorithm pkix.AlgorithmIdentifier, password []byte) (cipher + case algorithm.Algorithm.Equal(oidPBEWithSHAAnd3KeyTripleDESCBC): + cipherType = shaWithTripleDESCBC{} + case algorithm.Algorithm.Equal(oidPBEWithSHAAnd40BitRC2CBC): +- cipherType = shaWith40BitRC2CBC{} ++ panic("RC2 encryption not available") + default: + return nil, 0, NotImplementedError("algorithm " + algorithm.Algorithm.String() + " is not supported") + } +diff --git a/vendor/github.com/prometheus/exporter-toolkit/web/handler.go b/vendor/github.com/prometheus/exporter-toolkit/web/handler.go +index ae3ebc03b9..11dbc3c56e 100644 +--- a/vendor/github.com/prometheus/exporter-toolkit/web/handler.go ++++ b/vendor/github.com/prometheus/exporter-toolkit/web/handler.go +@@ -16,13 +16,11 @@ + package web + + import ( +- "encoding/hex" + "fmt" + "net/http" + "sync" + + "github.com/go-kit/log" +- "golang.org/x/crypto/bcrypt" + ) + + // extraHTTPHeaders is a map of HTTP headers that can be added to HTTP +@@ -36,22 +34,6 @@ var extraHTTPHeaders = map[string][]string{ + "Content-Security-Policy": nil, + } + +-func validateUsers(configPath string) error { +- c, err := getConfig(configPath) +- if err != nil { +- return err +- } +- +- for _, p := range c.Users { +- _, err = bcrypt.Cost([]byte(p)) +- if err != nil { +- return err +- } +- } +- +- return nil +-} +- + // validateHeaderConfig checks that the provided header configuration is correct. + // It does not check the validity of all the values, only the ones which are + // well-defined enumerations. +@@ -83,55 +65,3 @@ type webHandler struct { + // only once in parallel as this is CPU intensive. + bcryptMtx sync.Mutex + } +- +-func (u *webHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { +- c, err := getConfig(u.tlsConfigPath) +- if err != nil { +- u.logger.Log("msg", "Unable to parse configuration", "err", err) +- http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) +- return +- } +- +- // Configure http headers. +- for k, v := range c.HTTPConfig.Header { +- w.Header().Set(k, v) +- } +- +- if len(c.Users) == 0 { +- u.handler.ServeHTTP(w, r) +- return +- } +- +- user, pass, auth := r.BasicAuth() +- if auth { +- hashedPassword, validUser := c.Users[user] +- +- if !validUser { +- // The user is not found. Use a fixed password hash to +- // prevent user enumeration by timing requests. +- // This is a bcrypt-hashed version of "fakepassword". +- hashedPassword = "$2y$10$QOauhQNbBCuQDKes6eFzPeMqBSjb7Mr5DUmpZ/VcEd00UAV/LDeSi" +- } +- +- cacheKey := hex.EncodeToString(append(append([]byte(user), []byte(hashedPassword)...), []byte(pass)...)) +- authOk, ok := u.cache.get(cacheKey) +- +- if !ok { +- // This user, hashedPassword, password is not cached. +- u.bcryptMtx.Lock() +- err := bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(pass)) +- u.bcryptMtx.Unlock() +- +- authOk = err == nil +- u.cache.set(cacheKey, authOk) +- } +- +- if authOk && validUser { +- u.handler.ServeHTTP(w, r) +- return +- } +- } +- +- w.Header().Set("WWW-Authenticate", "Basic") +- http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized) +-} +diff --git a/vendor/github.com/prometheus/exporter-toolkit/web/tls_config.go b/vendor/github.com/prometheus/exporter-toolkit/web/tls_config.go +index 2668964a06..291464ba7e 100644 +--- a/vendor/github.com/prometheus/exporter-toolkit/web/tls_config.go ++++ b/vendor/github.com/prometheus/exporter-toolkit/web/tls_config.go +@@ -18,12 +18,8 @@ import ( + "crypto/x509" + "fmt" + "io/ioutil" +- "net" +- "net/http" + "path/filepath" + +- "github.com/go-kit/log" +- "github.com/go-kit/log/level" + "github.com/pkg/errors" + config_util "github.com/prometheus/common/config" + "gopkg.in/yaml.v2" +@@ -177,93 +173,6 @@ func ConfigToTLSConfig(c *TLSStruct) (*tls.Config, error) { + return cfg, nil + } + +-// ListenAndServe starts the server on the given address. Based on the file +-// tlsConfigPath, TLS or basic auth could be enabled. +-func ListenAndServe(server *http.Server, tlsConfigPath string, logger log.Logger) error { +- listener, err := net.Listen("tcp", server.Addr) +- if err != nil { +- return err +- } +- defer listener.Close() +- return Serve(listener, server, tlsConfigPath, logger) +-} +- +-// Server starts the server on the given listener. Based on the file +-// tlsConfigPath, TLS or basic auth could be enabled. +-func Serve(l net.Listener, server *http.Server, tlsConfigPath string, logger log.Logger) error { +- if tlsConfigPath == "" { +- level.Info(logger).Log("msg", "TLS is disabled.", "http2", false) +- return server.Serve(l) +- } +- +- if err := validateUsers(tlsConfigPath); err != nil { +- return err +- } +- +- // Setup basic authentication. +- var handler http.Handler = http.DefaultServeMux +- if server.Handler != nil { +- handler = server.Handler +- } +- +- c, err := getConfig(tlsConfigPath) +- if err != nil { +- return err +- } +- +- server.Handler = &webHandler{ +- tlsConfigPath: tlsConfigPath, +- logger: logger, +- handler: handler, +- cache: newCache(), +- } +- +- config, err := ConfigToTLSConfig(&c.TLSConfig) +- switch err { +- case nil: +- if !c.HTTPConfig.HTTP2 { +- server.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler)) +- } +- // Valid TLS config. +- level.Info(logger).Log("msg", "TLS is enabled.", "http2", c.HTTPConfig.HTTP2) +- case errNoTLSConfig: +- // No TLS config, back to plain HTTP. +- level.Info(logger).Log("msg", "TLS is disabled.", "http2", false) +- return server.Serve(l) +- default: +- // Invalid TLS config. +- return err +- } +- +- server.TLSConfig = config +- +- // Set the GetConfigForClient method of the HTTPS server so that the config +- // and certs are reloaded on new connections. +- server.TLSConfig.GetConfigForClient = func(*tls.ClientHelloInfo) (*tls.Config, error) { +- return getTLSConfig(tlsConfigPath) +- } +- return server.ServeTLS(l, "", "") +-} +- +-// Validate configuration file by reading the configuration and the certificates. +-func Validate(tlsConfigPath string) error { +- if tlsConfigPath == "" { +- return nil +- } +- if err := validateUsers(tlsConfigPath); err != nil { +- return err +- } +- c, err := getConfig(tlsConfigPath) +- if err != nil { +- return err +- } +- _, err = ConfigToTLSConfig(&c.TLSConfig) +- if err == errNoTLSConfig { +- return nil +- } +- return err +-} +- + type cipher uint16 + + func (c *cipher) UnmarshalYAML(unmarshal func(interface{}) error) error { +@@ -346,11 +255,3 @@ func (tv *tlsVersion) MarshalYAML() (interface{}, error) { + } + return fmt.Sprintf("%v", tv), nil + } +- +-// Listen starts the server on the given address. Based on the file +-// tlsConfigPath, TLS or basic auth could be enabled. +-// +-// Deprecated: Use ListenAndServe instead. +-func Listen(server *http.Server, tlsConfigPath string, logger log.Logger) error { +- return ListenAndServe(server, tlsConfigPath, logger) +-} diff --git a/0008-FIPS.patch b/1002-vendor-use-pbkdf2-from-OpenSSL.patch similarity index 96% rename from 0008-FIPS.patch rename to 1002-vendor-use-pbkdf2-from-OpenSSL.patch index 5ef8977..c8b824f 100644 --- a/0008-FIPS.patch +++ b/1002-vendor-use-pbkdf2-from-OpenSSL.patch @@ -1,7 +1,4 @@ -From 881b4f6789d4d207f9dff01929e094e69d59aeaa Mon Sep 17 00:00:00 2001 -From: Andreas Gerstmayr -Date: Wed, 22 Jun 2022 17:47:00 +0200 -Subject: [PATCH] FIPS +use pbkdf2 from OpenSSL if FIPS mode is enabled This patch modifies the x/crypto/pbkdf2 function to use OpenSSL if FIPS mode is enabled. diff --git a/1003-vendor-skip-goldenfiles-tests.patch b/1003-vendor-skip-goldenfiles-tests.patch new file mode 100644 index 0000000..8f18c0e --- /dev/null +++ b/1003-vendor-skip-goldenfiles-tests.patch @@ -0,0 +1,18 @@ +skip goldenfiles tests + +The golden files include memory dumps from a x86_64 machine. +Integers are stored as little endian on x86, but as big endian on s390x, +therefore loading this memory dump fails on s390x. + +diff --git a/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go b/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go +index 320f40f3bd..20f5fa4f46 100644 +--- a/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go ++++ b/vendor/github.com/grafana/grafana-plugin-sdk-go/experimental/golden_response_checker.go +@@ -203,6 +203,7 @@ func CheckGoldenJSONFrame(t *testing.T, dir string, name string, f *data.Frame, + // CheckGoldenJSONResponse will verify that the stored JSON file matches the given backend.DataResponse. + func CheckGoldenJSONResponse(t *testing.T, dir string, name string, dr *backend.DataResponse, updateFile bool) { + t.Helper() ++ t.Skip("skipping test: x86_64 memory dump is not compatible with other architectures") + fpath := path.Join(dir, name+".jsonc") + + expected, err := readGoldenJSONFile(fpath) diff --git a/Makefile b/Makefile index e7b4e39..9581fdf 100644 --- a/Makefile +++ b/Makefile @@ -14,14 +14,14 @@ WEBPACK_TAR := $(RPM_NAME)-webpack-$(VERSION)-$(RELEASE).tar.gz # - changes in dependency versions # - changes in Go module imports (which affect the vendored Go modules) PATCHES_PRE_VENDOR := \ - 0005-remove-unused-backend-dependencies.patch \ - 0006-remove-unused-frontend-crypto.patch \ - 0010-disable-husky-git-hook.patch \ + 0004-remove-unused-backend-dependencies.patch \ + 0005-remove-unused-frontend-crypto.patch \ + 0007-disable-husky-git-hook.patch \ # patches which must be applied before creating the webpack, for example: # - changes in Node.js sources or vendored dependencies PATCHES_PRE_WEBPACK := \ - 0006-remove-unused-frontend-crypto.patch \ + 0005-remove-unused-frontend-crypto.patch \ all: $(SOURCE_TAR) $(VENDOR_TAR) $(WEBPACK_TAR) @@ -42,12 +42,12 @@ $(VENDOR_TAR): $(SOURCE_TAR) # Generate Go files cd $(SOURCE_DIR) && make gen-go # Remove unused crypto - rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/cast5/cast5.go - rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/ed25519/ed25519.go - rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go - rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go - rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go - rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go + rm -r $(SOURCE_DIR)/vendor/golang.org/x/crypto/bcrypt + rm -r $(SOURCE_DIR)/vendor/golang.org/x/crypto/blowfish + rm -r $(SOURCE_DIR)/vendor/golang.org/x/crypto/cast5 + rm -r $(SOURCE_DIR)/vendor/golang.org/x/crypto/openpgp/elgamal + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go + rm -r $(SOURCE_DIR)/vendor/golang.org/x/crypto/pkcs12/internal/rc2 awk '$$2~/^v/ && $$4 != "indirect" {print "Provides: bundled(golang(" $$1 ")) = " substr($$2, 2)}' $(SOURCE_DIR)/go.mod | \ sed -E 's/=(.*)-(.*)-(.*)/=\1-\2.\3/g' > $@.manifest @@ -94,6 +94,7 @@ $(WEBPACK_TAR): $(VENDOR_TAR) $(SOURCE_DIR)/public/build \ $(SOURCE_DIR)/public/img \ $(SOURCE_DIR)/public/lib \ + $(SOURCE_DIR)/public/locales \ $(SOURCE_DIR)/public/views clean: diff --git a/README.md b/README.md index 2be3b0b..d9d003a 100644 --- a/README.md +++ b/README.md @@ -3,19 +3,22 @@ The grafana package ## Setup instructions * clone the upstream sources: `git clone https://github.com/grafana/grafana && cd grafana` -* checkout the desired version (tag): `git checkout vX.Y.Z` -* run: `go mod vendor && git add -f vendor && git commit -m vendor` (this step is required because some patches modify vendor sources) -* apply existing patches: `git am ../*.patch` and resolve any errors -* create new patches from the modified git commits: `git format-patch -N --no-stat --no-signature ` +* checkout the version of the specfile: `git checkout ` +* apply existing patches: `git am ../0*.patch` ## Upgrade instructions -* follow the Setup instructions above with the new upstream version +* follow the Setup instructions above +* rebase to the new version: `git fetch && git rebase --onto ` + * rebasing `remove-unused-backend-dependencies.patch`: only apply the patch to `pkg/extensions/main.go` and run `go mod tidy`, then `go.mod` and `go.sum` will get updated automatically + * rebasing `remove-unused-frontend-crypto.patch`: only apply the patch to `package.json` and run `yarn install`, then `yarn.lock` will get updated automatically +* create new patches from the modified git commits: `git format-patch -N --no-stat --no-signature && mv *.patch ..` * update `Version`, `Release`, `%changelog` and tarball NVRs in the specfile -* create bundles and manifest: `make clean all` +* create bundles and manifest: `./create_bundles_in_container.sh` +* inspect the vendor tarball for any new non-FIPS crypto (`vendor/golang.org/x/crypto`), delete these files/directories in the Makefile and update the `patch-removed-backend-crypto.patch` if required * update specfile with contents of the `.manifest` file * update the manpages patch in `0002-add-manpages.patch` and other patches if required * run local build: `rpkg local` -* run rpm linter: `rpkg lint -r grafana.rpmlintrc` +* run rpmlint: `rpmlint -r grafana.rpmlintrc /tmp/rpkg/grafana-*/grafana-*.src.rpm /tmp/rpkg/grafana-*/x86_64/grafana-*.x86_64.rpm` * run a scratch build: `fedpkg scratch-build --srpm` * upload new source tarballs: `fedpkg new-sources *.tar.gz *.tar.xz` * commit new `sources` file @@ -43,8 +46,6 @@ It is not possible to unconditionally apply all patches in the Makefile, and gre ## Reproducible Bundles Run `./create_bundles_in_container.sh` to generate a reproducible vendor and webpack bundle. -Alternatively, install the same software as in the container, create a bind mount from `/tmp/grafana-build` to the directory of this repository, and run `make`. -The bind mount is required because Webpack stores absolute paths in the JS source maps, and also resolves symlinks (i.e. symlinking `/tmp/grafana-build` doesn't work). ## Verification * compare the list of files with the upstream RPM at https://grafana.com/grafana/download diff --git a/grafana.rpmlintrc b/grafana.rpmlintrc index 9398089..2213e98 100644 --- a/grafana.rpmlintrc +++ b/grafana.rpmlintrc @@ -2,15 +2,16 @@ addFilter("E: non-readable /etc/grafana/grafana.ini 640") addFilter("E: non-readable /etc/grafana/ldap.toml 640") addFilter("E: non-standard-dir-perm /var/lib/grafana 750") addFilter("E: non-standard-dir-perm /etc/grafana/provisioning/datasources 750") -addFilter("E: zero-length /usr/share/grafana/public/.*") -addFilter("E: script-without-shebang .*\.json") - addFilter("W: non-standard-uid.* grafana") addFilter("W: non-standard-gid.* grafana") -addFilter("W: hidden-file-or-dir /usr/share/grafana/public/.*") -addFilter("W: log-files-without-logrotate .*") -addFilter("W: dangerous-command-in-%post chown") -addFilter("W: strange-permission build_frontend.sh 755") -addFilter("W: strange-permission list_bundled_nodejs_packages.py 755") -addFilter("W: %ifarch-applied-patch Patch.: 00.-skip-x86-goldenfiles-tests.patch") +addFilter("W: invalid-url Source1: grafana-vendor-") +addFilter("W: invalid-url Source2: grafana-webpack-") +addFilter("E: zero-length /usr/share/grafana/public") +addFilter("W: hidden-file-or-dir /usr/share/grafana/public") +addFilter("W: files-duplicate /usr/share/grafana/public/img") +addFilter("W: files-duplicate /usr/share/grafana/public/lib/.*.LICENSE.txt") + +addFilter("W: dangerous-command-in-%post chown") +addFilter("W: log-files-without-logrotate") +addFilter("W: %ifarch-applied-patch Patch.*: .*vendor-skip-goldenfiles-tests.patch") diff --git a/grafana.spec b/grafana.spec index 23682b8..f2cae6c 100644 --- a/grafana.spec +++ b/grafana.spec @@ -21,7 +21,7 @@ end} %global gomodulesmode GO111MODULE=auto Name: grafana -Version: 8.5.6 +Version: 9.0.2 Release: 1%{?dist} Summary: Metrics dashboard and graph editor License: AGPLv3 @@ -54,21 +54,24 @@ Source5: list_bundled_nodejs_packages.py # Source6 contains the script to create the vendor and webpack bundles in a container Source6: create_bundles_in_container.sh -# Patches +# Patches affecting the source tarball Patch1: 0001-update-grafana-cli-script-with-distro-specific-paths.patch Patch2: 0002-add-manpages.patch Patch3: 0003-update-default-configuration.patch -Patch4: 0004-skip-goldenfiles-tests.patch -Patch5: 0005-remove-unused-backend-dependencies.patch -Patch6: 0006-remove-unused-frontend-crypto.patch -Patch7: 0007-patch-removed-backend-crypto.patch -Patch8: 0008-FIPS.patch +Patch4: 0004-remove-unused-backend-dependencies.patch +Patch5: 0005-remove-unused-frontend-crypto.patch # https://github.com/grafana/grafana/pull/42334 -Patch9: 0009-notifications-use-HMAC-SHA256-to-generate-password-r.patch -Patch10: 0010-disable-husky-git-hook.patch -Patch11: 0011-skip-marketplace-plugin-install-test.patch +Patch6: 0006-notifications-use-HMAC-SHA256-to-generate-password-r.patch +Patch7: 0007-disable-husky-git-hook.patch +Patch8: 0008-skip-marketplace-plugin-install-test.patch # https://github.com/grafana/grafana/pull/51508 -Patch12: 0012-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch +Patch9: 0009-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch +Patch10: 0010-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch + +# Patches affecting the vendor tarball +Patch1001: 1001-vendor-patch-removed-backend-crypto.patch +Patch1002: 1002-vendor-use-pbkdf2-from-OpenSSL.patch +Patch1003: 1003-vendor-skip-goldenfiles-tests.patch # Intersection of go_arches and nodejs_arches ExclusiveArch: %{grafana_arches} @@ -134,25 +137,25 @@ Provides: grafana-stackdriver = 7.1.1-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.18.2 -Provides: bundled(golang(cuelang.org/go)) = 0.4.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.21.0 +Provides: bundled(golang(cuelang.org/go)) = 0.4.3 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 59.3.0+incompatible Provides: bundled(golang(github.com/Azure/go-autorest/autorest)) = 0.11.22 Provides: bundled(golang(github.com/BurntSushi/toml)) = 0.3.1 Provides: bundled(golang(github.com/Masterminds/semver)) = 1.5.0 Provides: bundled(golang(github.com/VividCortex/mysqlerr)) = 0.0.0-20170204212430.6c6b55f8796f -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.42.8 +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.44.9 Provides: bundled(golang(github.com/beevik/etree)) = 1.1.0 Provides: bundled(golang(github.com/benbjohnson/clock)) = 1.1.0 Provides: bundled(golang(github.com/bradfitz/gomemcache)) = 0.0.0-20190913173617.a41fca850d0b Provides: bundled(golang(github.com/centrifugal/centrifuge)) = 0.19.0 Provides: bundled(golang(github.com/cortexproject/cortex)) = 1.10.1-0.20211014125347.85c378182d0d Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 -Provides: bundled(golang(github.com/denisenkom/go-mssqldb)) = 0.11.0 +Provides: bundled(golang(github.com/denisenkom/go-mssqldb)) = 0.12.0 Provides: bundled(golang(github.com/dop251/goja)) = 0.0.0-20210804101310.32956a348b49 -Provides: bundled(golang(github.com/fatih/color)) = 1.10.0 +Provides: bundled(golang(github.com/fatih/color)) = 1.13.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/getsentry/sentry-go)) = 0.13.0 Provides: bundled(golang(github.com/go-openapi/strfmt)) = 0.20.2 Provides: bundled(golang(github.com/go-redis/redis/v8)) = 8.11.4 Provides: bundled(golang(github.com/go-sourcemap/sourcemap)) = 2.1.3+incompatible @@ -163,30 +166,29 @@ Provides: bundled(golang(github.com/gofrs/uuid)) = 4.0.0+incompatible Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 Provides: bundled(golang(github.com/golang/mock)) = 1.6.0 Provides: bundled(golang(github.com/golang/snappy)) = 0.0.4 -Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.7 +Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.8 Provides: bundled(golang(github.com/google/uuid)) = 1.3.0 Provides: bundled(golang(github.com/google/wire)) = 0.5.0 Provides: bundled(golang(github.com/gorilla/websocket)) = 1.4.2 Provides: bundled(golang(github.com/gosimple/slug)) = 1.9.0 -Provides: bundled(golang(github.com/grafana/cuetsy)) = 0.0.0-20211119211437.8c25464cc9bf -Provides: bundled(golang(github.com/grafana/grafana-aws-sdk)) = 0.10.3 -Provides: bundled(golang(github.com/grafana/grafana-azure-sdk-go)) = 1.1.0 -Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.131.0 +Provides: bundled(golang(github.com/grafana/cuetsy)) = 0.0.1 +Provides: bundled(golang(github.com/grafana/grafana-aws-sdk)) = 0.10.7 +Provides: bundled(golang(github.com/grafana/grafana-azure-sdk-go)) = 1.2.0 +Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.138.0 Provides: bundled(golang(github.com/grafana/loki)) = 1.6.2-0.20211015002020.7832783b1caa Provides: bundled(golang(github.com/grpc-ecosystem/go-grpc-middleware)) = 1.3.0 -Provides: bundled(golang(github.com/hashicorp/go-hclog)) = 0.16.1 +Provides: bundled(golang(github.com/hashicorp/go-hclog)) = 1.0.0 Provides: bundled(golang(github.com/hashicorp/go-plugin)) = 1.4.3 Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.3.0 Provides: bundled(golang(github.com/influxdata/influxdb-client-go/v2)) = 2.6.0 Provides: bundled(golang(github.com/influxdata/line-protocol)) = 0.0.0-20210311194329.9aa0e372d097 Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0 Provides: bundled(golang(github.com/json-iterator/go)) = 1.1.12 -Provides: bundled(golang(github.com/laher/mergefs)) = 0.1.1 Provides: bundled(golang(github.com/lib/pq)) = 1.10.4 Provides: bundled(golang(github.com/linkedin/goavro/v2)) = 2.10.0 Provides: bundled(golang(github.com/m3db/prometheus_remote_client_golang)) = 0.4.4 -Provides: bundled(golang(github.com/magefile/mage)) = 1.12.1 -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.12 +Provides: bundled(golang(github.com/magefile/mage)) = 1.13.0 +Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.14 Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.14.7 Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.2-0.20181231171920.c182affec369 Provides: bundled(golang(github.com/mwitkow/go-conntrack)) = 0.0.0-20190716064945.2f068394615f @@ -199,10 +201,9 @@ Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.12.1 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.2.0 Provides: bundled(golang(github.com/prometheus/common)) = 0.32.1 Provides: bundled(golang(github.com/prometheus/prometheus)) = 1.8.2-0.20211011171444.354d8d2ecfac -Provides: bundled(golang(github.com/robfig/cron)) = 0.0.0-20180505203441.b41be1df6967 Provides: bundled(golang(github.com/robfig/cron/v3)) = 3.0.1 Provides: bundled(golang(github.com/russellhaering/goxmldsig)) = 1.1.1 -Provides: bundled(golang(github.com/stretchr/testify)) = 1.7.0 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.7.2 Provides: bundled(golang(github.com/teris-io/shortid)) = 0.0.0-20171029131806.771a37caa5cf Provides: bundled(golang(github.com/ua-parser/uap-go)) = 0.0.0-20211112212520.00c877edfe0f Provides: bundled(golang(github.com/uber/jaeger-client-go)) = 2.29.1+incompatible @@ -213,26 +214,26 @@ Provides: bundled(golang(github.com/xorcare/pointer)) = 1.1.0 Provides: bundled(golang(github.com/yudai/gojsondiff)) = 1.0.0 Provides: bundled(golang(go.opentelemetry.io/collector)) = 0.31.0 Provides: bundled(golang(go.opentelemetry.io/collector/model)) = 0.31.0 -Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.2.0 +Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.6.3 Provides: bundled(golang(go.opentelemetry.io/otel/exporters/jaeger)) = 1.0.0 -Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.0.0 -Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.2.0 -Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20211117183948.ae814b36b871 +Provides: bundled(golang(go.opentelemetry.io/otel/sdk)) = 1.6.3 +Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.6.3 +Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20220331220935.ae2d96664a29 Provides: bundled(golang(golang.org/x/exp)) = 0.0.0-20210220032938.85be41e4509f -Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20211104180415.d3ed0bb246c8 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20220309155454.6242fa91716a Provides: bundled(golang(golang.org/x/sync)) = 0.0.0-20210220032951.036812b2e83c -Provides: bundled(golang(golang.org/x/time)) = 0.0.0-20211116232009.f0f3c7e86c11 -Provides: bundled(golang(golang.org/x/tools)) = 0.1.9 +Provides: bundled(golang(golang.org/x/time)) = 0.0.0-20220224211638.0e9765cccd65 +Provides: bundled(golang(golang.org/x/tools)) = 0.1.10 Provides: bundled(golang(gonum.org/v1/gonum)) = 0.11.0 -Provides: bundled(golang(google.golang.org/api)) = 0.60.0 -Provides: bundled(golang(google.golang.org/grpc)) = 1.42.0 -Provides: bundled(golang(google.golang.org/protobuf)) = 1.27.1 -Provides: bundled(golang(gopkg.in/ini.v1)) = 1.62.0 +Provides: bundled(golang(google.golang.org/api)) = 0.74.0 +Provides: bundled(golang(google.golang.org/grpc)) = 1.45.0 +Provides: bundled(golang(google.golang.org/protobuf)) = 1.28.0 +Provides: bundled(golang(gopkg.in/ini.v1)) = 1.66.2 Provides: bundled(golang(gopkg.in/ldap.v3)) = 3.1.0 Provides: bundled(golang(gopkg.in/mail.v2)) = 2.3.1 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(gopkg.in/yaml.v3)) = 3.0.0-20210107192922.496545a6307b +Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 Provides: bundled(golang(xorm.io/builder)) = 0.3.6 Provides: bundled(golang(xorm.io/core)) = 0.7.3 Provides: bundled(golang(xorm.io/xorm)) = 0.8.2 @@ -240,48 +241,58 @@ Provides: bundled(golang(github.com/andybalholm/brotli)) = 1.0.3 Provides: bundled(golang(github.com/go-kit/log)) = 0.1.0 Provides: bundled(golang(github.com/go-openapi/loads)) = 0.20.2 Provides: bundled(golang(github.com/go-openapi/spec)) = 0.20.4 -Provides: bundled(golang(github.com/googleapis/gax-go/v2)) = 2.1.1 +Provides: bundled(golang(github.com/googleapis/gax-go/v2)) = 2.2.0 Provides: bundled(golang(github.com/grafana/grafana-google-sdk-go)) = 0.0.0-20211104130251.b190293eaf58 Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0.5.4 Provides: bundled(golang(github.com/segmentio/encoding)) = 0.3.2 Provides: bundled(golang(go.uber.org/atomic)) = 1.9.0 -Provides: bundled(golang(google.golang.org/genproto)) = 0.0.0-20211118181313.81c1377c94b1 -Provides: bundled(golang(cloud.google.com/go/kms)) = 1.1.0 +Provides: bundled(golang(golang.org/x/text)) = 0.3.7 +Provides: bundled(golang(google.golang.org/genproto)) = 0.0.0-20220421151946.72621c1f0bd3 +Provides: bundled(golang(cloud.google.com/go/kms)) = 1.4.0 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 0.13.2 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys)) = 0.4.0 Provides: bundled(golang(github.com/Azure/go-autorest/autorest/adal)) = 0.9.17 +Provides: bundled(golang(github.com/armon/go-radix)) = 1.0.0 +Provides: bundled(golang(github.com/blugelabs/bluge)) = 0.1.9 Provides: bundled(golang(github.com/golang-migrate/migrate/v4)) = 4.7.0 Provides: bundled(golang(github.com/grafana/dskit)) = 0.0.0-20211011144203.3a88ec0b675f -Provides: bundled(golang(gocloud.dev)) = 0.24.0 +Provides: bundled(golang(github.com/grafana/thema)) = 0.0.0-20220523183731.72aebd14e751 +Provides: bundled(golang(github.com/laher/mergefs)) = 0.1.1 +Provides: bundled(golang(go.etcd.io/etcd/api/v3)) = 3.5.4 +Provides: bundled(golang(go.opentelemetry.io/contrib/propagators/jaeger)) = 1.6.0 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)) = 1.6.3 +Provides: bundled(golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)) = 1.6.3 +Provides: bundled(golang(gocloud.dev)) = 0.25.0 Provides: bundled(npm(@babel/core)) = 7.12.9 -Provides: bundled(npm(@babel/plugin-proposal-class-properties)) = 7.14.5 -Provides: bundled(npm(@babel/plugin-proposal-nullish-coalescing-operator)) = 7.14.5 +Provides: bundled(npm(@babel/plugin-proposal-class-properties)) = 7.16.7 +Provides: bundled(npm(@babel/plugin-proposal-nullish-coalescing-operator)) = 7.16.7 Provides: bundled(npm(@babel/plugin-proposal-object-rest-spread)) = 7.12.1 -Provides: bundled(npm(@babel/plugin-proposal-optional-chaining)) = 7.14.5 +Provides: bundled(npm(@babel/plugin-proposal-optional-chaining)) = 7.16.7 Provides: bundled(npm(@babel/plugin-syntax-dynamic-import)) = 7.8.3 Provides: bundled(npm(@babel/plugin-transform-react-constant-elements)) = 7.17.6 Provides: bundled(npm(@babel/plugin-transform-runtime)) = 7.17.0 Provides: bundled(npm(@babel/plugin-transform-typescript)) = 7.16.7 -Provides: bundled(npm(@babel/preset-env)) = 7.13.12 +Provides: bundled(npm(@babel/preset-env)) = 7.16.11 Provides: bundled(npm(@babel/preset-react)) = 7.16.7 Provides: bundled(npm(@babel/preset-typescript)) = 7.16.7 -Provides: bundled(npm(@betterer/betterer)) = 5.1.7 -Provides: bundled(npm(@betterer/cli)) = 5.1.7 -Provides: bundled(npm(@betterer/regexp)) = 5.1.7 +Provides: bundled(npm(@betterer/betterer)) = 5.3.5 +Provides: bundled(npm(@betterer/cli)) = 5.3.5 +Provides: bundled(npm(@betterer/eslint)) = 5.3.5 +Provides: bundled(npm(@betterer/regexp)) = 5.3.5 Provides: bundled(npm(@braintree/sanitize-url)) = 6.0.0 Provides: bundled(npm(@cypress/webpack-preprocessor)) = 5.11.1 Provides: bundled(npm(@emotion/css)) = 10.0.27 Provides: bundled(npm(@emotion/eslint-plugin)) = 11.7.0 -Provides: bundled(npm(@emotion/react)) = 11.5.0 +Provides: bundled(npm(@emotion/react)) = 11.9.0 Provides: bundled(npm(@grafana/api-documenter)) = 7.11.2 -Provides: bundled(npm(@grafana/aws-sdk)) = 0.0.35 +Provides: bundled(npm(@grafana/aws-sdk)) = 0.0.36 Provides: bundled(npm(@grafana/data)) = 0.0.0-use.local Provides: bundled(npm(@grafana/e2e)) = 0.0.0-use.local Provides: bundled(npm(@grafana/e2e-selectors)) = 0.0.0-use.local -Provides: bundled(npm(@grafana/eslint-config)) = 2.5.2 -Provides: bundled(npm(@grafana/experimental)) = 0.0.2-canary.22 +Provides: bundled(npm(@grafana/eslint-config)) = 4.0.0 +Provides: bundled(npm(@grafana/experimental)) = 0.0.2-canary.30 Provides: bundled(npm(@grafana/google-sdk)) = 0.0.3 -Provides: bundled(npm(@grafana/lezer-logql)) = 0.0.11 +Provides: bundled(npm(@grafana/lezer-logql)) = 0.0.12 Provides: bundled(npm(@grafana/runtime)) = 0.0.0-use.local Provides: bundled(npm(@grafana/schema)) = 0.0.0-use.local Provides: bundled(npm(@grafana/slate-react)) = 0.22.10-grafana @@ -289,16 +300,16 @@ Provides: bundled(npm(@grafana/toolkit)) = 0.0.0-use.local Provides: bundled(npm(@grafana/tsconfig)) = 1.2.0rc1 Provides: bundled(npm(@grafana/ui)) = 0.0.0-use.local Provides: bundled(npm(@jaegertracing/jaeger-ui-components)) = 0.0.0-use.local -Provides: bundled(npm(@jest/core)) = 26.6.3 -Provides: bundled(npm(@kusto/monaco-kusto)) = 5.1.1 +Provides: bundled(npm(@jest/core)) = 27.5.1 +Provides: bundled(npm(@kusto/monaco-kusto)) = 5.1.3 Provides: bundled(npm(@lezer/common)) = 0.15.12 Provides: bundled(npm(@lezer/lr)) = 0.15.8 -Provides: bundled(npm(@lingui/cli)) = 3.13.2 -Provides: bundled(npm(@lingui/core)) = 3.13.2 +Provides: bundled(npm(@lingui/cli)) = 3.13.3 +Provides: bundled(npm(@lingui/core)) = 3.13.3 Provides: bundled(npm(@lingui/macro)) = 3.12.1 -Provides: bundled(npm(@lingui/react)) = 3.13.2 +Provides: bundled(npm(@lingui/react)) = 3.13.3 Provides: bundled(npm(@mdx-js/react)) = 1.6.22 -Provides: bundled(npm(@microsoft/api-extractor)) = 7.19.5 +Provides: bundled(npm(@microsoft/api-extractor)) = 7.24.1 Provides: bundled(npm(@mochajs/json-file-reporter)) = 1.3.0 Provides: bundled(npm(@monaco-editor/react)) = 4.3.1 Provides: bundled(npm(@opentelemetry/api)) = 1.1.0 @@ -306,51 +317,50 @@ Provides: bundled(npm(@opentelemetry/exporter-collector)) = 0.25.0 Provides: bundled(npm(@opentelemetry/semantic-conventions)) = 0.25.0 Provides: bundled(npm(@pmmmwh/react-refresh-webpack-plugin)) = 0.5.4 Provides: bundled(npm(@popperjs/core)) = 2.11.2 -Provides: bundled(npm(@react-aria/button)) = 3.4.3 -Provides: bundled(npm(@react-aria/dialog)) = 3.1.8 -Provides: bundled(npm(@react-aria/focus)) = 3.5.4 -Provides: bundled(npm(@react-aria/interactions)) = 3.8.3 -Provides: bundled(npm(@react-aria/menu)) = 3.4.3 -Provides: bundled(npm(@react-aria/overlays)) = 3.8.1 -Provides: bundled(npm(@react-aria/utils)) = 3.11.3 -Provides: bundled(npm(@react-stately/collections)) = 3.3.7 -Provides: bundled(npm(@react-stately/menu)) = 3.2.6 -Provides: bundled(npm(@react-stately/tree)) = 3.2.3 -Provides: bundled(npm(@react-types/button)) = 3.4.4 -Provides: bundled(npm(@react-types/menu)) = 3.5.2 -Provides: bundled(npm(@react-types/overlays)) = 3.5.4 -Provides: bundled(npm(@react-types/shared)) = 3.11.2 -Provides: bundled(npm(@reduxjs/toolkit)) = 1.7.2 -Provides: bundled(npm(@rollup/plugin-commonjs)) = 21.0.2 -Provides: bundled(npm(@rollup/plugin-image)) = 2.1.1 +Provides: bundled(npm(@react-aria/button)) = 3.4.4 +Provides: bundled(npm(@react-aria/dialog)) = 3.1.9 +Provides: bundled(npm(@react-aria/focus)) = 3.5.5 +Provides: bundled(npm(@react-aria/interactions)) = 3.8.4 +Provides: bundled(npm(@react-aria/menu)) = 3.4.4 +Provides: bundled(npm(@react-aria/overlays)) = 3.8.2 +Provides: bundled(npm(@react-aria/utils)) = 3.12.0 +Provides: bundled(npm(@react-stately/collections)) = 3.3.8 +Provides: bundled(npm(@react-stately/menu)) = 3.2.7 +Provides: bundled(npm(@react-stately/tree)) = 3.2.4 +Provides: bundled(npm(@react-types/button)) = 3.4.5 +Provides: bundled(npm(@react-types/menu)) = 3.5.3 +Provides: bundled(npm(@react-types/overlays)) = 3.5.5 +Provides: bundled(npm(@react-types/shared)) = 3.12.0 +Provides: bundled(npm(@reduxjs/toolkit)) = 1.8.1 +Provides: bundled(npm(@rollup/plugin-alias)) = 3.1.9 +Provides: bundled(npm(@rollup/plugin-commonjs)) = 22.0.0 Provides: bundled(npm(@rollup/plugin-json)) = 4.1.0 -Provides: bundled(npm(@rollup/plugin-node-resolve)) = 13.1.3 +Provides: bundled(npm(@rollup/plugin-node-resolve)) = 13.3.0 Provides: bundled(npm(@rtsao/plugin-proposal-class-properties)) = 7.0.1-patch.1 -Provides: bundled(npm(@rushstack/eslint-patch)) = 1.0.6 -Provides: bundled(npm(@sentry/browser)) = 6.19.1 -Provides: bundled(npm(@sentry/types)) = 6.19.1 -Provides: bundled(npm(@sentry/utils)) = 6.19.1 -Provides: bundled(npm(@storybook/addon-a11y)) = 6.4.15 -Provides: bundled(npm(@storybook/addon-actions)) = 6.4.15 -Provides: bundled(npm(@storybook/addon-docs)) = 6.4.15 -Provides: bundled(npm(@storybook/addon-essentials)) = 6.4.15 +Provides: bundled(npm(@sentry/browser)) = 6.19.7 +Provides: bundled(npm(@sentry/types)) = 6.19.7 +Provides: bundled(npm(@sentry/utils)) = 6.19.7 +Provides: bundled(npm(@storybook/addon-a11y)) = 6.4.21 +Provides: bundled(npm(@storybook/addon-actions)) = 6.4.21 +Provides: bundled(npm(@storybook/addon-docs)) = 6.4.21 +Provides: bundled(npm(@storybook/addon-essentials)) = 6.4.21 Provides: bundled(npm(@storybook/addon-knobs)) = 6.4.0 -Provides: bundled(npm(@storybook/addon-storysource)) = 6.4.15 -Provides: bundled(npm(@storybook/addons)) = 6.4.15 -Provides: bundled(npm(@storybook/api)) = 6.4.15 -Provides: bundled(npm(@storybook/builder-webpack5)) = 6.4.15 -Provides: bundled(npm(@storybook/components)) = 6.4.15 -Provides: bundled(npm(@storybook/core-events)) = 6.4.15 -Provides: bundled(npm(@storybook/manager-webpack5)) = 6.4.15 -Provides: bundled(npm(@storybook/react)) = 6.4.15 -Provides: bundled(npm(@storybook/theming)) = 6.4.15 -Provides: bundled(npm(@swc/core)) = 1.2.160 -Provides: bundled(npm(@swc/helpers)) = 0.3.8 -Provides: bundled(npm(@testing-library/dom)) = 8.10.1 -Provides: bundled(npm(@testing-library/jest-dom)) = 5.16.2 +Provides: bundled(npm(@storybook/addon-storysource)) = 6.4.21 +Provides: bundled(npm(@storybook/addons)) = 6.4.21 +Provides: bundled(npm(@storybook/api)) = 6.4.21 +Provides: bundled(npm(@storybook/builder-webpack5)) = 6.4.21 +Provides: bundled(npm(@storybook/components)) = 6.4.21 +Provides: bundled(npm(@storybook/core-events)) = 6.4.21 +Provides: bundled(npm(@storybook/manager-webpack5)) = 6.4.21 +Provides: bundled(npm(@storybook/react)) = 6.4.21 +Provides: bundled(npm(@storybook/theming)) = 6.4.21 +Provides: bundled(npm(@swc/core)) = 1.2.187 +Provides: bundled(npm(@swc/helpers)) = 0.3.13 +Provides: bundled(npm(@testing-library/dom)) = 8.13.0 +Provides: bundled(npm(@testing-library/jest-dom)) = 5.16.4 Provides: bundled(npm(@testing-library/react)) = 12.1.4 -Provides: bundled(npm(@testing-library/react-hooks)) = 7.0.2 -Provides: bundled(npm(@testing-library/user-event)) = 13.5.0 +Provides: bundled(npm(@testing-library/react-hooks)) = 8.0.0 +Provides: bundled(npm(@testing-library/user-event)) = 14.2.0 Provides: bundled(npm(@types/angular)) = 1.8.3 Provides: bundled(npm(@types/angular-route)) = 1.7.2 Provides: bundled(npm(@types/chrome-remote-interface)) = 0.31.4 @@ -365,14 +375,14 @@ Provides: bundled(npm(@types/debounce-promise)) = 3.1.4 Provides: bundled(npm(@types/deep-freeze)) = 0.1.2 Provides: bundled(npm(@types/enzyme)) = 3.10.10 Provides: bundled(npm(@types/enzyme-adapter-react-16)) = 1.0.6 -Provides: bundled(npm(@types/eslint)) = 7.28.0 +Provides: bundled(npm(@types/eslint)) = 7.28.2 Provides: bundled(npm(@types/file-saver)) = 2.0.5 Provides: bundled(npm(@types/fs-extra)) = 8.1.2 Provides: bundled(npm(@types/google.analytics)) = 0.0.42 Provides: bundled(npm(@types/grafana__slate-react)) = 0.22.5 Provides: bundled(npm(@types/history)) = 4.7.9 Provides: bundled(npm(@types/hoist-non-react-statics)) = 3.3.1 -Provides: bundled(npm(@types/inquirer)) = 8.1.3 +Provides: bundled(npm(@types/inquirer)) = 8.2.1 Provides: bundled(npm(@types/is-hotkey)) = 0.1.7 Provides: bundled(npm(@types/jest)) = 26.0.15 Provides: bundled(npm(@types/jquery)) = 3.5.14 @@ -387,27 +397,29 @@ Provides: bundled(npm(@types/mousetrap)) = 1.6.9 Provides: bundled(npm(@types/node)) = 12.20.24 Provides: bundled(npm(@types/papaparse)) = 5.3.2 Provides: bundled(npm(@types/pluralize)) = 0.0.29 -Provides: bundled(npm(@types/prettier)) = 2.4.1 +Provides: bundled(npm(@types/prettier)) = 2.4.2 Provides: bundled(npm(@types/prismjs)) = 1.26.0 Provides: bundled(npm(@types/prop-types)) = 15.7.4 Provides: bundled(npm(@types/rc-time-picker)) = 3.4.1 Provides: bundled(npm(@types/react)) = 17.0.30 Provides: bundled(npm(@types/react-beautiful-dnd)) = 13.1.2 -Provides: bundled(npm(@types/react-calendar)) = 3.5.0 +Provides: bundled(npm(@types/react-calendar)) = 3.5.1 Provides: bundled(npm(@types/react-color)) = 3.0.6 -Provides: bundled(npm(@types/react-dev-utils)) = 9.0.8 +Provides: bundled(npm(@types/react-dev-utils)) = 9.0.10 Provides: bundled(npm(@types/react-dom)) = 17.0.10 Provides: bundled(npm(@types/react-grid-layout)) = 1.3.2 Provides: bundled(npm(@types/react-highlight-words)) = 0.16.4 Provides: bundled(npm(@types/react-icons)) = 2.2.7 Provides: bundled(npm(@types/react-loadable)) = 5.5.6 Provides: bundled(npm(@types/react-redux)) = 7.1.20 +Provides: bundled(npm(@types/react-resizable)) = 3.0.0 Provides: bundled(npm(@types/react-router-dom)) = 5.3.3 -Provides: bundled(npm(@types/react-table)) = 7.7.10 +Provides: bundled(npm(@types/react-table)) = 7.7.12 Provides: bundled(npm(@types/react-test-renderer)) = 17.0.1 Provides: bundled(npm(@types/react-transition-group)) = 4.4.4 Provides: bundled(npm(@types/react-virtualized-auto-sizer)) = 1.0.1 Provides: bundled(npm(@types/react-window)) = 1.8.5 +Provides: bundled(npm(@types/react-window-infinite-loader)) = 1.0.6 Provides: bundled(npm(@types/redux-mock-store)) = 1.0.3 Provides: bundled(npm(@types/reselect)) = 2.2.0 Provides: bundled(npm(@types/rimraf)) = 3.0.2 @@ -419,36 +431,35 @@ Provides: bundled(npm(@types/systemjs)) = 0.20.8 Provides: bundled(npm(@types/testing-library__jest-dom)) = 5.14.1 Provides: bundled(npm(@types/testing-library__react-hooks)) = 3.4.1 Provides: bundled(npm(@types/tinycolor2)) = 1.4.3 -Provides: bundled(npm(@types/tmp)) = 0.1.0 +Provides: bundled(npm(@types/tmp)) = 0.2.3 Provides: bundled(npm(@types/uuid)) = 8.3.3 -Provides: bundled(npm(@types/webpack)) = 4.41.7 -Provides: bundled(npm(@typescript-eslint/eslint-plugin)) = 4.28.0 -Provides: bundled(npm(@typescript-eslint/parser)) = 4.28.0 +Provides: bundled(npm(@typescript-eslint/eslint-plugin)) = 5.16.0 +Provides: bundled(npm(@typescript-eslint/parser)) = 5.16.0 Provides: bundled(npm(@visx/event)) = 2.6.0 -Provides: bundled(npm(@visx/gradient)) = 2.1.0 -Provides: bundled(npm(@visx/group)) = 2.1.0 +Provides: bundled(npm(@visx/gradient)) = 2.10.0 +Provides: bundled(npm(@visx/group)) = 2.10.0 Provides: bundled(npm(@visx/scale)) = 2.2.2 -Provides: bundled(npm(@visx/shape)) = 2.4.0 -Provides: bundled(npm(@visx/tooltip)) = 2.8.0 -Provides: bundled(npm(@welldone-software/why-did-you-render)) = 6.2.3 -Provides: bundled(npm(@wojtekmaj/enzyme-adapter-react-17)) = 0.6.6 -Provides: bundled(npm(angular)) = 1.8.2 +Provides: bundled(npm(@visx/shape)) = 2.10.0 +Provides: bundled(npm(@visx/tooltip)) = 2.10.0 +Provides: bundled(npm(@welldone-software/why-did-you-render)) = 7.0.1 +Provides: bundled(npm(@wojtekmaj/enzyme-adapter-react-17)) = 0.6.7 +Provides: bundled(npm(angular)) = 1.8.3 Provides: bundled(npm(angular-bindonce)) = 0.3.1 -Provides: bundled(npm(angular-route)) = 1.8.2 -Provides: bundled(npm(angular-sanitize)) = 1.8.2 +Provides: bundled(npm(angular-route)) = 1.8.3 +Provides: bundled(npm(angular-sanitize)) = 1.8.3 Provides: bundled(npm(ansicolor)) = 1.1.100 Provides: bundled(npm(app)) = 0.0.0-use.local Provides: bundled(npm(autoprefixer)) = 9.8.8 -Provides: bundled(npm(axios)) = 0.21.2 -Provides: bundled(npm(babel-jest)) = 26.6.3 -Provides: bundled(npm(babel-loader)) = 8.2.2 +Provides: bundled(npm(axios)) = 0.25.0 +Provides: bundled(npm(babel-jest)) = 27.5.1 +Provides: bundled(npm(babel-loader)) = 8.2.3 Provides: bundled(npm(babel-plugin-angularjs-annotate)) = 0.10.0 Provides: bundled(npm(babel-plugin-macros)) = 2.8.0 Provides: bundled(npm(baron)) = 3.0.3 Provides: bundled(npm(blink-diff)) = 1.0.13 Provides: bundled(npm(brace)) = 0.11.1 Provides: bundled(npm(calculate-size)) = 1.1.1 -Provides: bundled(npm(centrifuge)) = 2.8.4 +Provides: bundled(npm(centrifuge)) = 2.8.5 Provides: bundled(npm(chalk)) = 2.4.2 Provides: bundled(npm(chance)) = 1.1.8 Provides: bundled(npm(chrome-remote-interface)) = 0.31.2 @@ -458,11 +469,10 @@ Provides: bundled(npm(comlink)) = 4.3.1 Provides: bundled(npm(command-exists)) = 1.2.9 Provides: bundled(npm(commander)) = 2.11.0 Provides: bundled(npm(common-tags)) = 1.8.0 -Provides: bundled(npm(concurrently)) = 6.3.0 Provides: bundled(npm(copy-to-clipboard)) = 3.3.1 -Provides: bundled(npm(copy-webpack-plugin)) = 5.1.2 +Provides: bundled(npm(copy-webpack-plugin)) = 9.0.1 Provides: bundled(npm(core-js)) = 2.6.12 -Provides: bundled(npm(css-loader)) = 3.4.2 +Provides: bundled(npm(css-loader)) = 3.6.0 Provides: bundled(npm(css-minimizer-webpack-plugin)) = 3.4.1 Provides: bundled(npm(csstype)) = 2.6.18 Provides: bundled(npm(cypress)) = 9.5.1 @@ -479,91 +489,88 @@ Provides: bundled(npm(devtools-protocol)) = 0.0.927104 Provides: bundled(npm(emotion)) = 10.0.27 Provides: bundled(npm(enzyme)) = 3.11.0 Provides: bundled(npm(enzyme-to-json)) = 3.6.2 -Provides: bundled(npm(eslint)) = 7.28.0 -Provides: bundled(npm(eslint-config-prettier)) = 8.3.0 +Provides: bundled(npm(eslint)) = 8.11.0 +Provides: bundled(npm(eslint-config-prettier)) = 8.5.0 Provides: bundled(npm(eslint-plugin-import)) = 2.26.0 -Provides: bundled(npm(eslint-plugin-jest)) = 26.1.2 -Provides: bundled(npm(eslint-plugin-jsdoc)) = 37.7.0 +Provides: bundled(npm(eslint-plugin-jest)) = 26.2.2 +Provides: bundled(npm(eslint-plugin-jsdoc)) = 38.0.6 Provides: bundled(npm(eslint-plugin-lodash)) = 7.4.0 -Provides: bundled(npm(eslint-plugin-react)) = 7.28.0 +Provides: bundled(npm(eslint-plugin-react)) = 7.29.4 Provides: bundled(npm(eslint-plugin-react-hooks)) = 4.3.0 Provides: bundled(npm(eslint-webpack-plugin)) = 3.1.1 Provides: bundled(npm(eventemitter3)) = 4.0.7 Provides: bundled(npm(execa)) = 1.0.0 -Provides: bundled(npm(expose-loader)) = 3.1.0 +Provides: bundled(npm(expose-loader)) = 4.0.0 Provides: bundled(npm(fast-deep-equal)) = 3.1.3 -Provides: bundled(npm(fast-json-patch)) = 3.1.0 +Provides: bundled(npm(fast-json-patch)) = 3.1.1 Provides: bundled(npm(file-loader)) = 6.2.0 Provides: bundled(npm(file-saver)) = 2.0.5 Provides: bundled(npm(fork-ts-checker-webpack-plugin)) = 4.1.6 Provides: bundled(npm(fs-extra)) = 0.30.0 Provides: bundled(npm(fuzzy)) = 0.1.3 Provides: bundled(npm(glob)) = 7.2.0 -Provides: bundled(npm(globby)) = 7.1.1 +Provides: bundled(npm(globby)) = 9.2.0 Provides: bundled(npm(history)) = 4.10.1 Provides: bundled(npm(hoist-non-react-statics)) = 3.3.2 -Provides: bundled(npm(html-loader)) = 0.5.5 -Provides: bundled(npm(html-webpack-plugin)) = 3.2.0 +Provides: bundled(npm(html-loader)) = 3.1.0 +Provides: bundled(npm(html-webpack-plugin)) = 4.5.2 Provides: bundled(npm(http-server)) = 14.1.0 -Provides: bundled(npm(husky)) = 7.0.4 +Provides: bundled(npm(husky)) = 8.0.1 Provides: bundled(npm(iconscout-unicons-tarball)) = 1.0.0 Provides: bundled(npm(immer)) = 9.0.7 Provides: bundled(npm(immutable)) = 3.8.2 Provides: bundled(npm(inquirer)) = 7.3.3 Provides: bundled(npm(is-hotkey)) = 0.1.4 -Provides: bundled(npm(jest)) = 26.6.3 -Provides: bundled(npm(jest-canvas-mock)) = 2.3.0 +Provides: bundled(npm(jest)) = 27.5.1 +Provides: bundled(npm(jest-canvas-mock)) = 2.3.1 Provides: bundled(npm(jest-coverage-badges)) = 1.1.2 Provides: bundled(npm(jest-date-mock)) = 1.0.8 -Provides: bundled(npm(jest-environment-jsdom-fifteen)) = 1.0.2 -Provides: bundled(npm(jest-fail-on-console)) = 2.3.0 -Provides: bundled(npm(jest-junit)) = 13.0.0 -Provides: bundled(npm(jest-matcher-utils)) = 26.6.2 +Provides: bundled(npm(jest-fail-on-console)) = 2.4.1 +Provides: bundled(npm(jest-junit)) = 13.1.0 +Provides: bundled(npm(jest-matcher-utils)) = 27.5.1 Provides: bundled(npm(jest-mock-console)) = 1.2.3 Provides: bundled(npm(jquery)) = 3.5.1 Provides: bundled(npm(js-yaml)) = 3.13.1 Provides: bundled(npm(json-markup)) = 1.1.3 Provides: bundled(npm(json-source-map)) = 0.6.1 Provides: bundled(npm(jsurl)) = 0.1.5 +Provides: bundled(npm(kbar)) = 0.1.0b34 Provides: bundled(npm(lerna)) = 4.0.0 -Provides: bundled(npm(less)) = 3.13.1 -Provides: bundled(npm(less-loader)) = 5.0.0 +Provides: bundled(npm(less)) = 4.1.2 +Provides: bundled(npm(less-loader)) = 10.2.0 Provides: bundled(npm(lezer-promql)) = 0.22.0 -Provides: bundled(npm(lint-staged)) = 12.3.7 +Provides: bundled(npm(lint-staged)) = 12.4.1 Provides: bundled(npm(lodash)) = 4.17.21 Provides: bundled(npm(logfmt)) = 1.3.2 Provides: bundled(npm(lru-cache)) = 5.1.1 Provides: bundled(npm(lru-memoize)) = 1.1.0 -Provides: bundled(npm(marked)) = 4.0.12 +Provides: bundled(npm(marked)) = 4.0.16 Provides: bundled(npm(md5-file)) = 5.0.0 Provides: bundled(npm(memoize-one)) = 4.0.3 -Provides: bundled(npm(mini-css-extract-plugin)) = 0.7.0 -Provides: bundled(npm(minisearch)) = 5.0.0b1 -Provides: bundled(npm(mocha)) = 9.2.2 +Provides: bundled(npm(mini-css-extract-plugin)) = 2.6.0 +Provides: bundled(npm(mocha)) = 10.0.0 Provides: bundled(npm(mock-raf)) = 1.0.1 -Provides: bundled(npm(moment)) = 2.29.2 +Provides: bundled(npm(moment)) = 2.29.3 Provides: bundled(npm(moment-timezone)) = 0.5.34 Provides: bundled(npm(monaco-editor)) = 0.31.1 -Provides: bundled(npm(monaco-promql)) = 1.7.2 +Provides: bundled(npm(monaco-promql)) = 1.7.4 Provides: bundled(npm(mousetrap)) = 1.6.5 Provides: bundled(npm(mousetrap-global-bind)) = 1.1.0 -Provides: bundled(npm(moveable)) = 0.28.0 +Provides: bundled(npm(moveable)) = 0.29.8 Provides: bundled(npm(mutationobserver-shim)) = 0.3.7 Provides: bundled(npm(ngtemplate-loader)) = 2.1.0 -Provides: bundled(npm(node-notifier)) = 8.0.2 -Provides: bundled(npm(nodemon)) = 2.0.15 +Provides: bundled(npm(node-notifier)) = 10.0.1 +Provides: bundled(npm(nodemon)) = 2.0.16 Provides: bundled(npm(ol)) = 6.14.1 -Provides: bundled(npm(optimize-css-assets-webpack-plugin)) = 6.0.1 -Provides: bundled(npm(ora)) = 4.1.1 +Provides: bundled(npm(ora)) = 5.4.1 Provides: bundled(npm(papaparse)) = 5.3.1 Provides: bundled(npm(pixelmatch)) = 5.2.1 Provides: bundled(npm(pluralize)) = 8.0.0 Provides: bundled(npm(pngjs)) = 2.3.1 -Provides: bundled(npm(pnp-webpack-plugin)) = 1.6.4 Provides: bundled(npm(postcss)) = 7.0.39 -Provides: bundled(npm(postcss-flexbugs-fixes)) = 4.2.0 -Provides: bundled(npm(postcss-loader)) = 3.0.0 -Provides: bundled(npm(postcss-preset-env)) = 6.7.0 +Provides: bundled(npm(postcss-flexbugs-fixes)) = 4.2.1 +Provides: bundled(npm(postcss-loader)) = 4.3.0 +Provides: bundled(npm(postcss-preset-env)) = 7.4.3 Provides: bundled(npm(postcss-reporter)) = 7.0.5 Provides: bundled(npm(postcss-scss)) = 4.0.2 Provides: bundled(npm(prettier)) = 2.3.0 @@ -571,11 +578,11 @@ Provides: bundled(npm(prismjs)) = 1.27.0 Provides: bundled(npm(process)) = 0.11.10 Provides: bundled(npm(prop-types)) = 15.7.2 Provides: bundled(npm(raw-loader)) = 4.0.2 -Provides: bundled(npm(rc-cascader)) = 3.4.1 +Provides: bundled(npm(rc-cascader)) = 3.5.0 Provides: bundled(npm(rc-drawer)) = 4.4.3 Provides: bundled(npm(rc-slider)) = 9.7.5 Provides: bundled(npm(rc-time-picker)) = 3.7.3 -Provides: bundled(npm(re-resizable)) = 6.9.5 +Provides: bundled(npm(re-resizable)) = 6.9.9 Provides: bundled(npm(react)) = 17.0.1 Provides: bundled(npm(react-beautiful-dnd)) = 13.1.0 Provides: bundled(npm(react-calendar)) = 3.7.0 @@ -588,12 +595,12 @@ Provides: bundled(npm(react-dom)) = 17.0.1 Provides: bundled(npm(react-draggable)) = 4.4.4 Provides: bundled(npm(react-dropzone)) = 12.0.4 Provides: bundled(npm(react-grid-layout)) = 1.3.4 -Provides: bundled(npm(react-highlight-words)) = 0.17.0 +Provides: bundled(npm(react-highlight-words)) = 0.18.0 Provides: bundled(npm(react-hook-form)) = 7.5.3 Provides: bundled(npm(react-icons)) = 2.2.7 Provides: bundled(npm(react-inlinesvg)) = 2.3.0 Provides: bundled(npm(react-loadable)) = 5.5.0 -Provides: bundled(npm(react-moveable)) = 0.31.1 +Provides: bundled(npm(react-moveable)) = 0.32.7 Provides: bundled(npm(react-popper)) = 2.2.5 Provides: bundled(npm(react-popper-tooltip)) = 3.1.1 Provides: bundled(npm(react-redux)) = 7.2.6 @@ -604,39 +611,40 @@ Provides: bundled(npm(react-router-dom)) = 5.3.0 Provides: bundled(npm(react-select)) = 3.2.0 Provides: bundled(npm(react-select-event)) = 5.3.0 Provides: bundled(npm(react-split-pane)) = 0.1.92 -Provides: bundled(npm(react-table)) = 7.7.0 +Provides: bundled(npm(react-table)) = 7.8.0 Provides: bundled(npm(react-test-renderer)) = 17.0.2 Provides: bundled(npm(react-transition-group)) = 4.4.2 Provides: bundled(npm(react-use)) = 17.3.2 Provides: bundled(npm(react-virtualized-auto-sizer)) = 1.0.6 -Provides: bundled(npm(react-window)) = 1.8.6 +Provides: bundled(npm(react-window)) = 1.8.7 +Provides: bundled(npm(react-window-infinite-loader)) = 1.0.7 Provides: bundled(npm(redux)) = 4.1.1 Provides: bundled(npm(redux-mock-store)) = 1.5.4 Provides: bundled(npm(redux-thunk)) = 2.4.1 Provides: bundled(npm(regenerator-runtime)) = 0.11.1 -Provides: bundled(npm(replace-in-file)) = 4.3.1 Provides: bundled(npm(replace-in-file-webpack-plugin)) = 1.0.6 Provides: bundled(npm(reselect)) = 4.1.0 Provides: bundled(npm(resolve-as-bin)) = 2.1.0 Provides: bundled(npm(rimraf)) = 2.7.1 -Provides: bundled(npm(rollup)) = 2.70.1 +Provides: bundled(npm(rollup)) = 2.74.1 Provides: bundled(npm(rollup-plugin-copy)) = 3.4.0 Provides: bundled(npm(rollup-plugin-sourcemaps)) = 0.6.3 +Provides: bundled(npm(rollup-plugin-svg-import)) = 1.6.0 Provides: bundled(npm(rollup-plugin-terser)) = 7.0.2 Provides: bundled(npm(rst2html)) = 1.0.4 Provides: bundled(npm(rxjs)) = 6.6.7 -Provides: bundled(npm(sass)) = 1.27.0 -Provides: bundled(npm(sass-loader)) = 8.0.2 +Provides: bundled(npm(sass)) = 1.50.1 +Provides: bundled(npm(sass-loader)) = 12.6.0 Provides: bundled(npm(search-query-parser)) = 1.6.0 -Provides: bundled(npm(selecto)) = 1.15.0 +Provides: bundled(npm(selecto)) = 1.16.2 Provides: bundled(npm(semver)) = 5.7.1 -Provides: bundled(npm(simple-git)) = 3.4.0 -Provides: bundled(npm(sinon)) = 13.0.1 +Provides: bundled(npm(simple-git)) = 3.7.1 +Provides: bundled(npm(sinon)) = 14.0.0 Provides: bundled(npm(slate)) = 0.47.8 Provides: bundled(npm(slate-plain-serializer)) = 0.7.10 -Provides: bundled(npm(storybook-dark-mode)) = 1.0.9 -Provides: bundled(npm(style-loader)) = 1.1.3 -Provides: bundled(npm(stylelint)) = 14.6.0 +Provides: bundled(npm(storybook-dark-mode)) = 1.1.0 +Provides: bundled(npm(style-loader)) = 1.3.0 +Provides: bundled(npm(stylelint)) = 14.8.2 Provides: bundled(npm(stylelint-config-prettier)) = 9.0.3 Provides: bundled(npm(stylelint-config-sass-guidelines)) = 9.0.1 Provides: bundled(npm(symbol-observable)) = 4.0.0 @@ -647,22 +655,22 @@ Provides: bundled(npm(testing-library-selector)) = 0.2.1 Provides: bundled(npm(tether-drop)) = 1.5.0 Provides: bundled(npm(tinycolor2)) = 1.4.2 Provides: bundled(npm(tracelib)) = 1.0.1 -Provides: bundled(npm(ts-jest)) = 26.4.4 +Provides: bundled(npm(ts-jest)) = 27.1.3 Provides: bundled(npm(ts-loader)) = 6.2.1 -Provides: bundled(npm(ts-node)) = 9.0.0 +Provides: bundled(npm(ts-node)) = 9.1.1 Provides: bundled(npm(tslib)) = 1.14.1 Provides: bundled(npm(tween-functions)) = 1.2.0 -Provides: bundled(npm(typescript)) = 4.4.3 -Provides: bundled(npm(uplot)) = 1.6.19 -Provides: bundled(npm(url-loader)) = 2.3.0 +Provides: bundled(npm(typescript)) = 4.5.5 +Provides: bundled(npm(uplot)) = 1.6.21 +Provides: bundled(npm(url-loader)) = 4.1.1 Provides: bundled(npm(uuid)) = 3.4.0 Provides: bundled(npm(vendor)) = 0.0.0-use.local Provides: bundled(npm(visjs-network)) = 4.25.0 Provides: bundled(npm(wait-on)) = 6.0.1 -Provides: bundled(npm(webpack)) = 4.41.5 +Provides: bundled(npm(webpack)) = 4.46.0 Provides: bundled(npm(webpack-bundle-analyzer)) = 4.5.0 Provides: bundled(npm(webpack-cli)) = 4.9.2 -Provides: bundled(npm(webpack-dev-server)) = 4.7.4 +Provides: bundled(npm(webpack-dev-server)) = 4.9.0 Provides: bundled(npm(webpack-filter-warnings-plugin)) = 1.2.1 Provides: bundled(npm(webpack-merge)) = 5.8.0 Provides: bundled(npm(whatwg-fetch)) = 3.6.2 @@ -688,21 +696,23 @@ rm -r plugins-bundled %patch1 -p1 %patch2 -p1 %patch3 -p1 -%ifarch s390x i686 armv7hl %patch4 -p1 -%endif %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%if %{enable_fips_mode} -%patch8 -p1 -%endif %if 0%{?fedora} || 0%{?rhel} > 8 -%patch9 -p1 +%patch6 -p1 %endif +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %patch10 -p1 -%patch11 -p1 -%patch12 -p1 + +%patch1001 -p1 +%if %{enable_fips_mode} +%patch1002 -p1 +%endif +%ifarch s390x i686 armv7hl +%patch1003 -p1 +%endif %build @@ -726,6 +736,8 @@ install -d %{buildroot}%{_sbindir} install -d %{buildroot}%{_datadir}/%{name} install -d %{buildroot}%{_libexecdir}/%{name} cp -a conf public plugins-bundled %{buildroot}%{_datadir}/%{name} +rm %{buildroot}%{_datadir}/%{name}/public/img/icons/.gitignore +rm %{buildroot}%{_datadir}/%{name}/public/lib/.gitignore # wrappers install -p -m 755 packaging/wrappers/grafana-cli %{buildroot}%{_sbindir}/%{name}-cli @@ -741,6 +753,7 @@ install -p -m 644 docs/man/man1/* %{buildroot}%{_mandir}/man1 # config dirs install -d %{buildroot}%{_sysconfdir}/%{name} install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning +install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/access-control install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/dashboards install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/datasources install -d %{buildroot}%{_sysconfdir}/%{name}/provisioning/notifiers @@ -838,6 +851,7 @@ OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryptio %config(noreplace) %{_sysconfdir}/sysconfig/grafana-server %dir %{_sysconfdir}/%{name} %attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning +%attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/access-control %attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/dashboards %attr(0750, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/datasources %attr(0755, root, %{GRAFANA_GROUP}) %dir %{_sysconfdir}/%{name}/provisioning/notifiers @@ -867,12 +881,15 @@ OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryptio %{_mandir}/man1/%{name}-cli.1* # other docs and license -%license LICENSE LICENSING.md -%doc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md ISSUE_TRIAGE.md MAINTAINERS.md NOTICE.md +%license LICENSE LICENSING.md NOTICE.md +%doc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md HALL_OF_FAME.md ISSUE_TRIAGE.md MAINTAINERS.md %doc PLUGIN_DEV.md README.md ROADMAP.md SECURITY.md SUPPORT.md UPGRADING_DEPENDENCIES.md WORKFLOW.md %changelog +* Thu Jul 07 2022 Andreas Gerstmayr 9.0.2-1 +- update to 9.0.2 tagged upstream community sources, see CHANGELOG + * Wed Jun 29 2022 Andreas Gerstmayr 8.5.6-1 - update to 8.5.6 tagged upstream community sources, see CHANGELOG - updated license to AGPLv3 diff --git a/sources b/sources index 2ba611c..a71c283 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (grafana-8.5.6.tar.gz) = 4fdaf7ab446182074dcd01d979e3198a2fe0cc77f1c6ad160d8f9187c43544d8891d591b23f3294ef0f2e4f85984b3759d345e46caf8f85f34101177fd073edc -SHA512 (grafana-webpack-8.5.6-1.tar.gz) = 6e73c39c5a15a78163204e60ec71264754127ecd61c9e8911600b4792f193011c32a041353ae679eb669da7fd9c364739e079e1664e05464ed4f9f281acd717c -SHA512 (grafana-vendor-8.5.6-1.tar.xz) = 2adeaa9ad7d7a04da98ce26def1417bceefe49ac565447a5b697168531bb2c4d756a415eded64d3ca59b22aba66dffdf3a950745574901860e26dfdb94f7dfb0 +SHA512 (grafana-9.0.2.tar.gz) = bb694d17b7c7f96143718ede8b795d93ba86ade3207c438c8e61838a04c31ff1d5f979259a09d60b223f43aee6975d43b597ddc5d2a88e86b7112e4d963d5c4f +SHA512 (grafana-webpack-9.0.2-1.tar.gz) = 9a90bf3909862afd64a5dfe34997b533a3679b099cd63b88f1792c38aa07c433d3851211b8f9ee2db7f511b212b6896c77e7bfa89230427be884e3e6a59a4b37 +SHA512 (grafana-vendor-9.0.2-1.tar.xz) = 7e08c3dad38f6fa99a5dbe056d4afff708c64878ed37c8da844442fb7b4bcaa205f2ec4c60d0e6996eebe707b3f644b9193ca396cbc03e2182e312293eb6621e