public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync

Browse Source
This commit is contained in:
Ryan McKinley committed 2025-03-04 07:28:26 +03:00
2 parents bf5427e24c 8a341ebcce
commit 0bd4053924
12 files changed
+82 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

go.mod
+1 -1
View File
@@ -75,7 +75,7 @@ require (
github.com/googleapis/gax-go/v2 v2.14.1 // @grafana/grafana-backend-group
github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
github.com/gorilla/websocket v1.5.3 // @grafana/grafana-app-platform-squad
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 // @grafana/alerting-backend
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 // @grafana/alerting-backend
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 // @grafana/identity-access-team
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 // @grafana/identity-access-team
github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
go.sum
+2 -2
View File
@@ -1555,8 +1555,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 h1:kESrzm0FcRVLmGIQCgl1MCwDGLH4sLzWphr7mcFdbfI=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 h1:6rRaOEp1S2sB1qWxJ1JeVjaufyHTUSHnA2C5A34elmI=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897/go.mod h1:p5P86ajOwL2XPJN6+xu6QJUtO4DptdFiqJ35r3Ac4HY=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 h1:FTuDRy/Shw8yOdG+v1DnkeuaCAl8fvwgcfaG9Wccuhg=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501/go.mod h1:XVpdLhaeYqz414FmGnW00/0vTe1x8c0GRH3KaeRtyg0=
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 h1:DnRUYiAotHXnrfYJCvhH1NkiyWVcPm5Pd+P7Ugqt/d8=
pkg/registry/apis/query/query.go
+13 -1
View File
@@ -160,7 +160,19 @@ func (r *queryREST) Connect(connectCtx context.Context, name string, _ runtime.O
// Actually run the query
rsp, err := b.execute(ctx, req)
if err != nil {
b.log.Error("hit unexpected error while executing query, this will show as an unhandled k8s status error", "err", err)
// log unexpected errors
var k8sErr *errorsK8s.StatusError
if errors.As(err, &k8sErr) {
// we do not need to log 4xx errors as they are expected
if k8sErr.ErrStatus.Code >= 500 {
b.log.Error("hit unexpected k8s error while executing query", "err", err, "status", k8sErr.Status())
}
b.log.Debug("sending a known k8s error to the client", "err", err, "status", k8sErr.Status())
} else {
b.log.Error("hit unexpected error while executing query, this will show as an unhandled k8s status error", "err", err)
}
// return the error to the client, will send all non k8s errors as a k8 unexpected error
responder.Error(err)
return
}
pkg/storage/unified/apistore/go.mod
+1 -1
View File
@@ -199,7 +199,7 @@ require (
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 // indirect
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 // indirect
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 // indirect
github.com/grafana/dataplane/sdata v0.0.9 // indirect
github.com/grafana/dskit v0.0.0-20241105154643-a6b453a88040 // indirect
pkg/storage/unified/apistore/go.sum
+2 -2
View File
@@ -1248,8 +1248,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 h1:kESrzm0FcRVLmGIQCgl1MCwDGLH4sLzWphr7mcFdbfI=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 h1:6rRaOEp1S2sB1qWxJ1JeVjaufyHTUSHnA2C5A34elmI=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897/go.mod h1:p5P86ajOwL2XPJN6+xu6QJUtO4DptdFiqJ35r3Ac4HY=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 h1:FTuDRy/Shw8yOdG+v1DnkeuaCAl8fvwgcfaG9Wccuhg=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501/go.mod h1:XVpdLhaeYqz414FmGnW00/0vTe1x8c0GRH3KaeRtyg0=
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 h1:DnRUYiAotHXnrfYJCvhH1NkiyWVcPm5Pd+P7Ugqt/d8=
pkg/storage/unified/resource/go.mod
+1 -1
View File
@@ -128,7 +128,7 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 // indirect
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 // indirect
github.com/grafana/dataplane/sdata v0.0.9 // indirect
github.com/grafana/grafana-app-sdk/logging v0.30.0 // indirect
github.com/grafana/grafana-aws-sdk v0.31.5 // indirect
pkg/storage/unified/resource/go.sum
+2 -2
View File
@@ -1146,8 +1146,8 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2 h1:kESrzm0FcRVLmGIQCgl1MCwDGLH4sLzWphr7mcFdbfI=
github.com/grafana/alerting v0.0.0-20250225150117-15e285d78df2/go.mod h1:hdGB3dSl8Ma9Rjo2YiAEAjMkZ5HiNJbNDqRKDefRZrM=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897 h1:6rRaOEp1S2sB1qWxJ1JeVjaufyHTUSHnA2C5A34elmI=
github.com/grafana/alerting v0.0.0-20250303221654-bb85a58ec897/go.mod h1:p5P86ajOwL2XPJN6+xu6QJUtO4DptdFiqJ35r3Ac4HY=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501 h1:FTuDRy/Shw8yOdG+v1DnkeuaCAl8fvwgcfaG9Wccuhg=
github.com/grafana/authlib v0.0.0-20250225105729-99e678595501/go.mod h1:XVpdLhaeYqz414FmGnW00/0vTe1x8c0GRH3KaeRtyg0=
github.com/grafana/authlib/types v0.0.0-20250224151205-5ef97131cc82 h1:DnRUYiAotHXnrfYJCvhH1NkiyWVcPm5Pd+P7Ugqt/d8=
public/locales/de-DE/grafana.json
+12 -5
View File
@@ -1078,11 +1078,6 @@
}
},
"open": "",
"panels": {
"multi-select": {
"selection-number": ""
}
},
"row": {
"header": {
"hide": "",
@@ -1171,6 +1166,16 @@
"rows": "Gesamtanzahl an Zeilen",
"table-title": "Statistiken"
},
"layout": {
"common": {
"copy": "",
"copy-or-duplicate": "",
"delete": "",
"duplicate": "",
"layout": "",
"panels-title": ""
}
},
"options": {
"description": "",
"title": "",
@@ -1325,6 +1330,8 @@
"viz-panel": {
"options": {
"description": "",
"open-edit": "",
"plugin-type-image": "",
"title": "",
"title-option": "",
"transparent-background": ""
public/locales/es-ES/grafana.json
+12 -5
View File
@@ -1078,11 +1078,6 @@
}
},
"open": "",
"panels": {
"multi-select": {
"selection-number": ""
}
},
"row": {
"header": {
"hide": "",
@@ -1171,6 +1166,16 @@
"rows": "Número total de filas",
"table-title": "Estadísticas"
},
"layout": {
"common": {
"copy": "",
"copy-or-duplicate": "",
"delete": "",
"duplicate": "",
"layout": "",
"panels-title": ""
}
},
"options": {
"description": "",
"title": "",
@@ -1325,6 +1330,8 @@
"viz-panel": {
"options": {
"description": "",
"open-edit": "",
"plugin-type-image": "",
"title": "",
"title-option": "",
"transparent-background": ""
public/locales/fr-FR/grafana.json
+12 -5
View File
@@ -1078,11 +1078,6 @@
}
},
"open": "",
"panels": {
"multi-select": {
"selection-number": ""
}
},
"row": {
"header": {
"hide": "",
@@ -1171,6 +1166,16 @@
"rows": "Nombre total de lignes",
"table-title": "Statistiques"
},
"layout": {
"common": {
"copy": "",
"copy-or-duplicate": "",
"delete": "",
"duplicate": "",
"layout": "",
"panels-title": ""
}
},
"options": {
"description": "",
"title": "",
@@ -1325,6 +1330,8 @@
"viz-panel": {
"options": {
"description": "",
"open-edit": "",
"plugin-type-image": "",
"title": "",
"title-option": "",
"transparent-background": ""
public/locales/pt-BR/grafana.json
+12 -5
View File
@@ -1078,11 +1078,6 @@
}
},
"open": "",
"panels": {
"multi-select": {
"selection-number": ""
}
},
"row": {
"header": {
"hide": "",
@@ -1171,6 +1166,16 @@
"rows": "Número total de linhas",
"table-title": "Estatísticas"
},
"layout": {
"common": {
"copy": "",
"copy-or-duplicate": "",
"delete": "",
"duplicate": "",
"layout": "",
"panels-title": ""
}
},
"options": {
"description": "",
"title": "",
@@ -1325,6 +1330,8 @@
"viz-panel": {
"options": {
"description": "",
"open-edit": "",
"plugin-type-image": "",
"title": "",
"title-option": "",
"transparent-background": ""
public/locales/zh-Hans/grafana.json
+12 -5
View File
@@ -1069,11 +1069,6 @@
}
},
"open": "",
"panels": {
"multi-select": {
"selection-number": ""
}
},
"row": {
"header": {
"hide": "",
@@ -1162,6 +1157,16 @@
"rows": "总行数",
"table-title": "统计信息"
},
"layout": {
"common": {
"copy": "",
"copy-or-duplicate": "",
"delete": "",
"duplicate": "",
"layout": "",
"panels-title": ""
}
},
"options": {
"description": "",
"title": "",
@@ -1316,6 +1321,8 @@
"viz-panel": {
"options": {
"description": "",
"open-edit": "",
"plugin-type-image": "",
"title": "",
"title-option": "",
"transparent-background": ""