head 1.10; access; symbols pkgsrc-2026Q1:1.10.0.16 pkgsrc-2026Q1-base:1.10 pkgsrc-2025Q4:1.10.0.14 pkgsrc-2025Q4-base:1.10 pkgsrc-2025Q3:1.10.0.12 pkgsrc-2025Q3-base:1.10 pkgsrc-2025Q2:1.10.0.10 pkgsrc-2025Q2-base:1.10 pkgsrc-2025Q1:1.10.0.8 pkgsrc-2025Q1-base:1.10 pkgsrc-2024Q4:1.10.0.6 pkgsrc-2024Q4-base:1.10 pkgsrc-2024Q3:1.10.0.4 pkgsrc-2024Q3-base:1.10 pkgsrc-2024Q2:1.10.0.2 pkgsrc-2024Q2-base:1.10 pkgsrc-2024Q1:1.8.0.2 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.6.0.4 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.2 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.4.0.4 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.2 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.1.0.2 pkgsrc-2022Q4-base:1.1; locks; strict; comment @# @; 1.10 date 2024.06.09.22.44.05; author wiz; state Exp; branches; next 1.9; commitid FqRhqsj66HqSqmdF; 1.9 date 2024.05.13.15.59.54; author wiz; state Exp; branches; next 1.8; commitid JgaurM1xNhMa4R9F; 1.8 date 2024.02.20.12.43.19; author jperkin; state Exp; branches; next 1.7; commitid DLD21Sl320cdEaZE; 1.7 date 2024.02.15.13.24.06; author wiz; state dead; branches; next 1.6; commitid SLu0wqp178pS1xYE; 1.6 date 2023.09.07.14.58.16; author jperkin; state Exp; branches; next 1.5; commitid LHLp362rU7fiJQDE; 1.5 date 2023.08.27.12.09.56; author tnn; state Exp; branches; next 1.4; commitid 14PqgiM2f0mr9qCE; 1.4 date 2023.03.05.21.22.45; author triaxx; state Exp; branches; next 1.3; commitid lPMGygQwOlRSPYfE; 1.3 date 2023.02.21.10.14.29; author jperkin; state Exp; branches; next 1.2; commitid eqAU7FWM047wwneE; 1.2 date 2023.02.07.22.27.22; author triaxx; state dead; branches; next 1.1; commitid cphQZWS3iy4T1EcE; 1.1 date 2022.11.15.16.45.26; author jperkin; state Exp; branches; next ; commitid Cb2pOPUhJ29zPO1E; desc @@ 1.10 log @grafana: update to 11.0.0. Features and enhancements Alerting: Add two sets of provisioning actions for rules and notifications . #87572, @@yuri-tceretian Chore: Upgrade go to 1.21.10. #87472, @@stephaniehingtgen Auth: Force lowercase login/email for users. #86985, @@eleijonmarck Navigation: Add a return to previous button when navigating to different sections. #86797, @@eledobleefe DashboardScene: Move add library panel view from grid item to drawer. #86409, @@torkelo CloudWatch : Add missing AWS/ES metrics. #86271, @@thepalbi Alerting: Reduce set of fields that could trigger alert state change. #86266, @@benoittgt OAuth: Make sub claim required for generic oauth behind feature toggle. #86118, @@kalleep Grafana E2E: Add deprecation notice and update docs. #85778, @@sunker Loki: Remove API restrictions on resource calls. #85201, @@svennergr Chore: Upgrade go to 1.21.10. (Enterprise) @ text @$NetBSD: patch-go.mod,v 1.9 2024/05/13 15:59:54 wiz Exp $ Bluge upstream is dead, and k8s refuse to support non-Linux platforms, so we're stuck carrying these changes. Previous pull requests: https://github.com/blugelabs/bluge/pull/139 https://github.com/kubernetes/kubernetes/pull/120498 Here's how to generate these patches: $ cd $WRKSRC $ cp -p go.mod go.mod.orig $ cp -p go.sum go.sum.orig $ go get github.com/jperkin/bluge@@master $ go mod edit --replace=github.com/blugelabs/bluge=github.com/jperkin/bluge@@ $ go get github.com/jperkin/apiserver@@master $ go mod edit --replace=k8s.io/apiserver=github.com/jperkin/apiserver@@ $ go mod tidy Then show-go-modules and mkpatches as normal. --- go.mod.orig 2024-05-13 07:34:53.000000000 +0000 +++ go.mod @@@@ -474,6 +474,7 @@@@ require github.com/grafana/authlib v0.0. require ( github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/blugelabs/ice/v2 v2.0.1 // indirect github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.9.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect @@@@ -519,3 +520,7 @@@@ exclude github.com/mattn/go-sqlite3 v2.0 // Use our fork xorm. go.work currently overrides this and points to the local ./pkg/util/xorm directory. replace xorm.io/xorm => github.com/grafana/grafana/pkg/util/xorm v0.0.1 + +replace github.com/blugelabs/bluge => github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395 + +replace k8s.io/apiserver => github.com/jperkin/apiserver v0.0.0-20240219180422-2d63424797e0 @ 1.9 log @grafana: update to 10.4.2. 10.4.2 Bug fixes Angular deprecation: Prefer local "angularDetected" value to the remote one. #85631, @@xnyo AuthProxy: Fix missing session for ldap auth proxy users. #85237, @@Jguer Alerting: Fix receiver inheritance when provisioning a notification policy. #85192, @@julienduchesne CloudMonitoring: Only run query if filters are complete. #85016, @@aangelisc 10.4.1 Features and enhancements Alerting: Add "Keep Last State" backend functionality. #84406, @@rwwiv Postgres: Allow disabling SNI on SSL-enabled connections. #84249, @@papagian DataQuery: Track panel plugin id not type. #83164, @@torkelo Bug fixes Elasticsearch: Fix legend for alerting, expressions and previously frontend queries. #84685, @@ivanahuckova Alerting: Fix optional fields requiring validation rule. #84595, @@gillesdemey ExtSvcAccounts: FIX prevent service account deletion. #84511, @@gamab Loki: Fix null pointer exception in case request returned an error. #84401, @@svennergr Dashboard: Fix issue where out-of-view shared query panels caused blank dependent panels. #84197, @@kaydelaney Auth: Only call rotate token if we have a session expiry cookie. #84181, @@kalleep Serviceaccounts: Add ability to add samename SA for different orgs. #83953, @@eleijonmarck GenAI: Update the component only when the response is fully generated. #83895, @@ivanortegaalba Tempo: Better fallbacks for metrics query. #83688, @@adrapereira Tempo: Add template variable interpolation for filters. #83667, @@joey-grafana Alerting: Fix saving evaluation group. #83234, @@soniaAguilarPeiron QueryVariableEditor: Select a variable ds does not work. #83181, @@ivanortegaalba Logs Panel: Add option extra UI functionality for log context. #83129, @@svennergr 10.4 Major release, see https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v10-4/ for details. @ text @d1 1 a1 1 $NetBSD$ d22 1 a22 1 --- go.mod.orig 2024-04-10 13:19:40.000000000 +0000 d24 1 a24 2 @@@@ -487,6 +487,7 @@@@ require github.com/spyzhov/ajson v0.9.0 require github.com/fullstorydev/grpchan v1.1.1 // @@grafana/backend-platform d27 1 d29 4 a32 5 github.com/bufbuild/protocompile v0.4.0 // indirect github.com/grafana/sqlds/v3 v3.2.0 // indirect github.com/jhump/protoreflect v1.15.1 // indirect @@@@ -520,3 +521,7 @@@@ replace xorm.io/xorm => ./pkg/util/xorm replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20240208102907-e82436ce63e6 d34 2 a35 1 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible @ 1.8 log @grafana: Restore illumos support. @ text @d9 1 a9 5 go get github.com/jperkin/bluge@@master go mod edit --replace=github.com/blugelabs/bluge=github.com/jperkin/bluge@@ go get github.com/jperkin/apiserver@@master go mod edit --replace=k8s.io/apiserver=github.com/jperkin/apiserver@@ go mod tidy d11 12 a22 1 --- go.mod.orig 2024-02-02 15:14:58.000000000 +0000 d24 2 a25 26 @@@@ -121,7 +121,7 @@@@ require ( gopkg.in/mail.v2 v2.3.1 // @@grafana/backend-platform gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // @@grafana/alerting-squad-backend - xorm.io/builder v0.3.6 // @@grafana/backend-platform + xorm.io/builder v0.3.6 // indirect; @@grafana/backend-platform xorm.io/core v0.7.3 // @@grafana/backend-platform xorm.io/xorm v0.8.2 // @@grafana/alerting-squad-backend ) @@@@ -173,7 +173,7 @@@@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect - github.com/hashicorp/go-multierror v1.1.1 // @@grafana/alerting-squad + github.com/hashicorp/go-multierror v1.1.1 // indirect; @@grafana/alerting-squad github.com/hashicorp/go-sockaddr v1.0.2 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/yamux v0.1.1 // indirect @@@@ -477,6 +477,8 @@@@ require ( github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect ) +require github.com/blugelabs/ice/v2 v2.0.1 // indirect + // Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream replace github.com/crewjam/saml => github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c d27 7 a33 2 @@@@ -497,3 +499,7 @@@@ replace xorm.io/xorm => ./pkg/util/xorm replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20231027171310-70c52bf65758 d37 1 a37 1 +replace github.com/blugelabs/bluge v0.1.9 => github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395 d39 1 a39 1 +replace k8s.io/apiserver v0.29.0 => github.com/jperkin/apiserver v0.0.0-20240219180422-2d63424797e0 @ 1.7 log @grafana: update to 10.3.3. Many changes since last pkgsrc version, see https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v10-3/ The Illumos patches didn't apply and have been dropped. @ text @d1 1 a1 1 $NetBSD: patch-go.mod,v 1.6 2023/09/07 14:58:16 jperkin Exp $ d3 2 a4 2 Use bluge fork to support illumos. https://github.com/blugelabs/bluge/pull/139 d6 2 a7 2 Use apiserver fork to support illumos. https://github.com/kubernetes/kubernetes/pull/120498 d9 7 a15 1 --- go.mod.orig 2023-08-23 17:05:28.000000000 +0000 d17 29 a45 10 @@@@ -298,6 +298,7 @@@@ require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect + github.com/blugelabs/ice/v2 v2.0.1 // indirect github.com/bmatcuk/doublestar v1.1.1 // indirect github.com/buildkite/yaml v2.1.0+incompatible // indirect github.com/bwmarrin/snowflake v0.3.0 // indirect @@@@ -491,3 +492,7 @@@@ replace google.golang.org/grpc => google replace github.com/lib/pq => github.com/lib/pq v1.10.6 d49 1 a49 1 +replace github.com/blugelabs/bluge => github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395 d51 1 a51 1 +replace k8s.io/apiserver v0.27.1 => github.com/jperkin/apiserver v0.0.0-20230907131324-edf907a81faa @ 1.6 log @grafana: Fix build on illumos. @ text @d1 1 a1 1 $NetBSD: patch-go.mod,v 1.5 2023/08/27 12:09:56 tnn Exp $ @ 1.5 log @grafana: update to 10.1.0 - The Canvas panel is GA - New Trend Panel - New Datagrid panel - Drag and drop spreadsheets into Grafana - Select data sources more easily - Time series time region support - Annotation filtering - Redesigned and improved log context - Query multiple data sources in Explore - OpenTelemetry replacing OpenTracing - State history view - Preview notification templates @ text @d1 1 a1 1 $NetBSD: patch-go.mod,v 1.4 2023/03/05 21:22:45 triaxx Exp $ d6 3 d19 1 a19 1 @@@@ -491,3 +492,5 @@@@ replace google.golang.org/grpc => google d25 2 @ 1.4 log @grafana: Update to 9.4.3 upstream changes: ----------------- 9.4.3 (2023-03-02) o https://github.com/grafana/grafana/releases/tag/v9.4.3 9.4.2 (2023-03-02) o https://github.com/grafana/grafana/releases/tag/v9.4.2 9.4.1 (2023-02-28) o https://github.com/grafana/grafana/releases/tag/v9.4.1 9.4.0-beta1 o https://github.com/grafana/grafana/releases/tag/v9.4.0-beta1 @ text @d1 1 a1 1 $NetBSD: patch-go.mod,v 1.3 2023/02/21 10:14:29 jperkin Exp $ d6 1 a6 1 --- go.mod.orig 2023-03-01 22:08:07.000000000 +0000 d8 2 a9 3 @@@@ -289,6 +289,7 @@@@ require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Masterminds/goutils v1.1.1 // indirect d11 1 d15 3 a17 3 github.com/containerd/containerd v1.6.8 // indirect @@@@ -430,3 +431,5 @@@@ replace github.com/prometheus/alertmanag replace google.golang.org/grpc => google.golang.org/grpc v1.45.0 d19 1 a19 1 replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 @ 1.3 log @grafana: Reapply illumos fixes lost in previous update. @ text @d1 1 a1 1 $NetBSD$ d6 1 a6 1 --- go.mod.orig 2023-01-26 14:38:58.000000000 +0000 d8 4 a11 13 @@@@ -108,7 +108,7 @@@@ require ( go.opentelemetry.io/otel/trace v1.7.0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d - golang.org/x/net v0.1.0 // indirect + golang.org/x/net v0.1.0 golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 golang.org/x/sync v0.1.0 golang.org/x/time v0.0.0-20220609170525-579cf78fd858 @@@@ -271,6 +271,7 @@@@ require ( cloud.google.com/go v0.102.0 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect github.com/armon/go-metrics v0.3.10 // indirect d15 2 a16 2 github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect @@@@ -386,3 +387,5 @@@@ replace github.com/prometheus/alertmanag @ 1.2 log @commit.msg @ text @d1 1 a1 1 $NetBSD: patch-go.mod,v 1.1 2022/11/15 16:45:26 jperkin Exp $ d6 1 a6 1 --- go.mod.orig 2022-11-08 10:38:42.000000000 +0000 d8 12 a19 3 @@@@ -264,6 +264,7 @@@@ require ( require ( cloud.google.com/go v0.100.2 // indirect d25 4 a28 4 @@@@ -370,3 +371,5 @@@@ replace xorm.io/xorm => github.com/grafa // Use our fork of the upstream alertmanagers. // This is required in order to get notification delivery errors from the receivers API. replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293 @ 1.1 log @grafana: Update to 9.2.4. 9.2.4 (2022-11-07) Features and enhancements Access Control: Add an endpoint for setting several managed resource permissions. Accessibility: Increase Select placeholder contrast to be WCAG AA compliant. Alerting: Append org ID to alert notification URLs. Alerting: Make the Grouped view the default one for Rules. Build: Remove unnecessary alpine package updates. Chore: Upgrade Go to 1.19.3. Google Cloud Monitoring: Set frame interval to draw null values. Instrumentation: Expose when the binary was built as a gauge. Loki: Preserve X-ID-Token header. Search: Reduce requests in folder view. TimeSeries: More thorough detection of negative values for auto-stacking direction. Bug fixes Alerting: Attempt to preserve UID from migrated legacy channel. Alerting: Fix response is not returned for invalid Duration in Provisioning API. Alerting: Fix screenshot is not taken for stale series. Auth: Fix admins not seeing pending invites. MSSQL/Postgres: Fix visual query editor filter disappearing. Tempo: Fix dropdown issue on tag field focus. Timeseries: Fix null pointer when matching fill below to field. Plugin development fixes & changes Toolkit: Fix Webpack less-loader config. @ text @d1 1 a1 1 $NetBSD$ @