Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Gareth Dawson
|
72de321560 | ||
|
Gareth Dawson
|
2eaabdd074 | ||
|
Gareth Dawson
|
57930f22f5 |
Generated
+1
-1
@@ -13,7 +13,7 @@ import (
|
|||||||
// schema is unexported to prevent accidental overwrites
|
// schema is unexported to prevent accidental overwrites
|
||||||
var (
|
var (
|
||||||
schemaReceiver = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", NewReceiver(), &ReceiverList{}, resource.WithKind("Receiver"),
|
schemaReceiver = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", NewReceiver(), &ReceiverList{}, resource.WithKind("Receiver"),
|
||||||
resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{
|
resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{
|
||||||
FieldSelector: "spec.title",
|
FieldSelector: "spec.title",
|
||||||
FieldValueFunc: func(o resource.Object) (string, error) {
|
FieldValueFunc: func(o resource.Object) (string, error) {
|
||||||
cast, ok := o.(*Receiver)
|
cast, ok := o.(*Receiver)
|
||||||
|
|||||||
@@ -790,8 +790,6 @@ VariableOption: {
|
|||||||
text: string | [...string]
|
text: string | [...string]
|
||||||
// Value of the option
|
// Value of the option
|
||||||
value: string | [...string]
|
value: string | [...string]
|
||||||
// Additional properties for multi-props variables
|
|
||||||
properties?: {[string]: string}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Query variable specification
|
// Query variable specification
|
||||||
|
|||||||
@@ -794,8 +794,6 @@ VariableOption: {
|
|||||||
text: string | [...string]
|
text: string | [...string]
|
||||||
// Value of the option
|
// Value of the option
|
||||||
value: string | [...string]
|
value: string | [...string]
|
||||||
// Additional properties for multi-props variables
|
|
||||||
properties?: {[string]: string}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Query variable specification
|
// Query variable specification
|
||||||
|
|||||||
@@ -301,8 +301,6 @@ var _ resource.ListObject = &DashboardList{}
|
|||||||
|
|
||||||
// Copy methods for all subresource types
|
// Copy methods for all subresource types
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// DeepCopy creates a full deep copy of DashboardStatus
|
// DeepCopy creates a full deep copy of DashboardStatus
|
||||||
func (s *DashboardStatus) DeepCopy() *DashboardStatus {
|
func (s *DashboardStatus) DeepCopy() *DashboardStatus {
|
||||||
cpy := &DashboardStatus{}
|
cpy := &DashboardStatus{}
|
||||||
|
|||||||
@@ -301,8 +301,6 @@ var _ resource.ListObject = &DashboardList{}
|
|||||||
|
|
||||||
// Copy methods for all subresource types
|
// Copy methods for all subresource types
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// DeepCopy creates a full deep copy of DashboardStatus
|
// DeepCopy creates a full deep copy of DashboardStatus
|
||||||
func (s *DashboardStatus) DeepCopy() *DashboardStatus {
|
func (s *DashboardStatus) DeepCopy() *DashboardStatus {
|
||||||
cpy := &DashboardStatus{}
|
cpy := &DashboardStatus{}
|
||||||
|
|||||||
@@ -794,8 +794,6 @@ VariableOption: {
|
|||||||
text: string | [...string]
|
text: string | [...string]
|
||||||
// Value of the option
|
// Value of the option
|
||||||
value: string | [...string]
|
value: string | [...string]
|
||||||
// Additional properties for multi-props variables
|
|
||||||
properties?: {[string]: string}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Query variable specification
|
// Query variable specification
|
||||||
|
|||||||
@@ -1411,8 +1411,6 @@ type DashboardVariableOption struct {
|
|||||||
Text DashboardStringOrArrayOfString `json:"text"`
|
Text DashboardStringOrArrayOfString `json:"text"`
|
||||||
// Value of the option
|
// Value of the option
|
||||||
Value DashboardStringOrArrayOfString `json:"value"`
|
Value DashboardStringOrArrayOfString `json:"value"`
|
||||||
// Additional properties for multi-props variables
|
|
||||||
Properties map[string]string `json:"properties,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewDashboardVariableOption creates a new DashboardVariableOption object.
|
// NewDashboardVariableOption creates a new DashboardVariableOption object.
|
||||||
|
|||||||
@@ -798,8 +798,6 @@ VariableOption: {
|
|||||||
text: string | [...string]
|
text: string | [...string]
|
||||||
// Value of the option
|
// Value of the option
|
||||||
value: string | [...string]
|
value: string | [...string]
|
||||||
// Additional properties for multi-props variables
|
|
||||||
properties?: {[string]: string}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Query variable specification
|
// Query variable specification
|
||||||
|
|||||||
@@ -1414,8 +1414,6 @@ type DashboardVariableOption struct {
|
|||||||
Text DashboardStringOrArrayOfString `json:"text"`
|
Text DashboardStringOrArrayOfString `json:"text"`
|
||||||
// Value of the option
|
// Value of the option
|
||||||
Value DashboardStringOrArrayOfString `json:"value"`
|
Value DashboardStringOrArrayOfString `json:"value"`
|
||||||
// Additional properties for multi-props variables
|
|
||||||
Properties map[string]string `json:"properties,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewDashboardVariableOption creates a new DashboardVariableOption object.
|
// NewDashboardVariableOption creates a new DashboardVariableOption object.
|
||||||
|
|||||||
+2
-2
File diff suppressed because one or more lines are too long
@@ -18,8 +18,6 @@ import (
|
|||||||
v1beta1 "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
|
v1beta1 "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ()
|
|
||||||
|
|
||||||
var appManifestData = app.ManifestData{
|
var appManifestData = app.ManifestData{
|
||||||
AppName: "folder",
|
AppName: "folder",
|
||||||
Group: "folder.grafana.app",
|
Group: "folder.grafana.app",
|
||||||
|
|||||||
+4
-6
@@ -82,8 +82,8 @@ cloud.google.com/go/storage v1.55.0 h1:NESjdAToN9u1tmhVqhXCaCwYBuvEhZLLv0gBr+2zn
|
|||||||
cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
|
cloud.google.com/go/storage v1.55.0/go.mod h1:ztSmTTwzsdXe5syLVS0YsbFxXuvEmEyZj7v7zChEmuY=
|
||||||
cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
|
cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
|
||||||
cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
|
cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
|
||||||
connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
|
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
|
||||||
connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
|
connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
|
||||||
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819 h1:Zh+Ur3OsoWpvALHPLT45nOekHkgOt+IOfutBbPqM17I=
|
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819 h1:Zh+Ur3OsoWpvALHPLT45nOekHkgOt+IOfutBbPqM17I=
|
||||||
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819/go.mod h1:WjmQxb+W6nVNCgj8nXrF24lIz95AHwnSl36tpjDZSU8=
|
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819/go.mod h1:WjmQxb+W6nVNCgj8nXrF24lIz95AHwnSl36tpjDZSU8=
|
||||||
cuelang.org/go v0.11.1 h1:pV+49MX1mmvDm8Qh3Za3M786cty8VKPWzQ1Ho4gZRP0=
|
cuelang.org/go v0.11.1 h1:pV+49MX1mmvDm8Qh3Za3M786cty8VKPWzQ1Ho4gZRP0=
|
||||||
@@ -749,8 +749,6 @@ github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
|
|||||||
github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
|
github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
|
||||||
github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
|
github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
|
||||||
github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
||||||
github.com/google/gnostic v0.7.1 h1:t5Kc7j/8kYr8t2u11rykRrPPovlEMG4+xdc/SpekATs=
|
|
||||||
github.com/google/gnostic v0.7.1/go.mod h1:KSw6sxnxEBFM8jLPfJd46xZP+yQcfE8XkiqfZx5zR28=
|
|
||||||
github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
|
github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
|
||||||
github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
|
github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
|
||||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||||
@@ -889,8 +887,8 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604
|
|||||||
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
|
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
|
||||||
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
|
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
|
||||||
github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
|
github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
|
||||||
github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f h1:fTlIj5n4x5dU63XHItug7GLjtnaeJdPqBlqg4zlABq0=
|
github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae h1:35W3Wjp9KWnSoV/DuymmyIj5aHE0CYlDQ5m2KeXUPAc=
|
||||||
github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f/go.mod h1:VBNcIhunCZsJ3/mcYx+j7uFf0P/108eiWa+8+Z9ll3o=
|
github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae/go.mod h1:6CJ1uXmLZ13ufpO9xE4pST+DyaBt0uszzrV0YnoaVLQ=
|
||||||
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
|
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
|
||||||
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
|
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
|
||||||
github.com/grafana/sqlds/v5 v5.0.3 h1:+yUMUxfa0WANQsmS9xtTFSRX1Q55Iv1B9EjlrW4VlBU=
|
github.com/grafana/sqlds/v5 v5.0.3 h1:+yUMUxfa0WANQsmS9xtTFSRX1Q55Iv1B9EjlrW4VlBU=
|
||||||
|
|||||||
@@ -217,13 +217,6 @@ metaV0Alpha1: {
|
|||||||
title: string
|
title: string
|
||||||
description?: string
|
description?: string
|
||||||
}]
|
}]
|
||||||
// +listType=atomic
|
|
||||||
addedFunctions?: [...{
|
|
||||||
// +listType=set
|
|
||||||
targets: [...string]
|
|
||||||
title: string
|
|
||||||
description?: string
|
|
||||||
}]
|
|
||||||
// +listType=set
|
// +listType=set
|
||||||
// +listMapKey=id
|
// +listMapKey=id
|
||||||
exposedComponents?: [...{
|
exposedComponents?: [...{
|
||||||
|
|||||||
@@ -193,8 +193,6 @@ type MetaExtensions struct {
|
|||||||
AddedComponents []MetaV0alpha1ExtensionsAddedComponents `json:"addedComponents,omitempty"`
|
AddedComponents []MetaV0alpha1ExtensionsAddedComponents `json:"addedComponents,omitempty"`
|
||||||
// +listType=atomic
|
// +listType=atomic
|
||||||
AddedLinks []MetaV0alpha1ExtensionsAddedLinks `json:"addedLinks,omitempty"`
|
AddedLinks []MetaV0alpha1ExtensionsAddedLinks `json:"addedLinks,omitempty"`
|
||||||
// +listType=atomic
|
|
||||||
AddedFunctions []MetaV0alpha1ExtensionsAddedFunctions `json:"addedFunctions,omitempty"`
|
|
||||||
// +listType=set
|
// +listType=set
|
||||||
// +listMapKey=id
|
// +listMapKey=id
|
||||||
ExposedComponents []MetaV0alpha1ExtensionsExposedComponents `json:"exposedComponents,omitempty"`
|
ExposedComponents []MetaV0alpha1ExtensionsExposedComponents `json:"exposedComponents,omitempty"`
|
||||||
@@ -398,21 +396,6 @@ func NewMetaV0alpha1ExtensionsAddedLinks() *MetaV0alpha1ExtensionsAddedLinks {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// +k8s:openapi-gen=true
|
|
||||||
type MetaV0alpha1ExtensionsAddedFunctions struct {
|
|
||||||
// +listType=set
|
|
||||||
Targets []string `json:"targets"`
|
|
||||||
Title string `json:"title"`
|
|
||||||
Description *string `json:"description,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMetaV0alpha1ExtensionsAddedFunctions creates a new MetaV0alpha1ExtensionsAddedFunctions object.
|
|
||||||
func NewMetaV0alpha1ExtensionsAddedFunctions() *MetaV0alpha1ExtensionsAddedFunctions {
|
|
||||||
return &MetaV0alpha1ExtensionsAddedFunctions{
|
|
||||||
Targets: []string{},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// +k8s:openapi-gen=true
|
// +k8s:openapi-gen=true
|
||||||
type MetaV0alpha1ExtensionsExposedComponents struct {
|
type MetaV0alpha1ExtensionsExposedComponents struct {
|
||||||
Id string `json:"id"`
|
Id string `json:"id"`
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -367,8 +367,7 @@ func jsonDataToMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.MetaJSOND
|
|||||||
|
|
||||||
// Map Extensions
|
// Map Extensions
|
||||||
if len(jsonData.Extensions.AddedLinks) > 0 || len(jsonData.Extensions.AddedComponents) > 0 ||
|
if len(jsonData.Extensions.AddedLinks) > 0 || len(jsonData.Extensions.AddedComponents) > 0 ||
|
||||||
len(jsonData.Extensions.ExposedComponents) > 0 || len(jsonData.Extensions.ExtensionPoints) > 0 ||
|
len(jsonData.Extensions.ExposedComponents) > 0 || len(jsonData.Extensions.ExtensionPoints) > 0 {
|
||||||
len(jsonData.Extensions.AddedFunctions) > 0 {
|
|
||||||
extensions := &pluginsv0alpha1.MetaExtensions{}
|
extensions := &pluginsv0alpha1.MetaExtensions{}
|
||||||
|
|
||||||
if len(jsonData.Extensions.AddedLinks) > 0 {
|
if len(jsonData.Extensions.AddedLinks) > 0 {
|
||||||
@@ -399,20 +398,6 @@ func jsonDataToMetaJSONData(jsonData plugins.JSONData) pluginsv0alpha1.MetaJSOND
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(jsonData.Extensions.AddedFunctions) > 0 {
|
|
||||||
extensions.AddedFunctions = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsAddedFunctions, 0, len(jsonData.Extensions.AddedFunctions))
|
|
||||||
for _, comp := range jsonData.Extensions.AddedFunctions {
|
|
||||||
v0Comp := pluginsv0alpha1.MetaV0alpha1ExtensionsAddedFunctions{
|
|
||||||
Targets: comp.Targets,
|
|
||||||
Title: comp.Title,
|
|
||||||
}
|
|
||||||
if comp.Description != "" {
|
|
||||||
v0Comp.Description = &comp.Description
|
|
||||||
}
|
|
||||||
extensions.AddedFunctions = append(extensions.AddedFunctions, v0Comp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(jsonData.Extensions.ExposedComponents) > 0 {
|
if len(jsonData.Extensions.ExposedComponents) > 0 {
|
||||||
extensions.ExposedComponents = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsExposedComponents, 0, len(jsonData.Extensions.ExposedComponents))
|
extensions.ExposedComponents = make([]pluginsv0alpha1.MetaV0alpha1ExtensionsExposedComponents, 0, len(jsonData.Extensions.ExposedComponents))
|
||||||
for _, comp := range jsonData.Extensions.ExposedComponents {
|
for _, comp := range jsonData.Extensions.ExposedComponents {
|
||||||
|
|||||||
@@ -41,13 +41,9 @@ Select a group to expand it and view the list of alert rules within that group.
|
|||||||
|
|
||||||
The list view includes a number of filters to simplify managing large volumes of alerts.
|
The list view includes a number of filters to simplify managing large volumes of alerts.
|
||||||
|
|
||||||
## Filter and save searches
|
|
||||||
|
|
||||||
Click the **Filter** button to open the filter popup. You can filter by name, label, folder/namespace, evaluation group, data source, contact point, rule source, rule state, rule type, and the health of the alert rule from the popup menu. Click **Apply** at the bottom of the filter popup to enact the filters as you search.
|
Click the **Filter** button to open the filter popup. You can filter by name, label, folder/namespace, evaluation group, data source, contact point, rule source, rule state, rule type, and the health of the alert rule from the popup menu. Click **Apply** at the bottom of the filter popup to enact the filters as you search.
|
||||||
|
|
||||||
Click the **Saved searches** button to open the list of previously saved searches, or click **+ Save current search** to add your current search to the saved searches list. You can also rename a saved search or set it as a default search. When you set a saved search as the default search, the Alert rules page opens with the search applied.
|
{{< figure src="/media/docs/alerting/alerting-list-view-filter.png" max-width="750px" alt="Alert rule filter options" >}}
|
||||||
|
|
||||||
{{< figure src="/media/docs/alerting/alerting-saved-searches.png" max-width="750px" alt="Alert rule filter options" >}}
|
|
||||||
|
|
||||||
## Change alert rules list view
|
## Change alert rules list view
|
||||||
|
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ killercoda:
|
|||||||
|
|
||||||
This tutorial is a continuation of the [Get started with Grafana Alerting - Route alerts using dynamic labels](http://www.grafana.com/tutorials/alerting-get-started-pt5/) tutorial.
|
This tutorial is a continuation of the [Get started with Grafana Alerting - Route alerts using dynamic labels](http://www.grafana.com/tutorials/alerting-get-started-pt5/) tutorial.
|
||||||
|
|
||||||
{{< youtube id="mqj_hN24zLU" >}}
|
|
||||||
|
|
||||||
<!-- USE CASE -->
|
<!-- USE CASE -->
|
||||||
|
|
||||||
In this tutorial you will learn how to:
|
In this tutorial you will learn how to:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ require (
|
|||||||
buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.36.2-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling
|
buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.36.2-20250703125925-3f0fcf4bff96.1 // @grafana/observability-traces-and-profiling
|
||||||
cloud.google.com/go/kms v1.22.0 // @grafana/grafana-backend-group
|
cloud.google.com/go/kms v1.22.0 // @grafana/grafana-backend-group
|
||||||
cloud.google.com/go/storage v1.55.0 // @grafana/grafana-backend-group
|
cloud.google.com/go/storage v1.55.0 // @grafana/grafana-backend-group
|
||||||
connectrpc.com/connect v1.19.1 // @grafana/observability-traces-and-profiling
|
connectrpc.com/connect v1.18.1 // @grafana/observability-traces-and-profiling
|
||||||
cuelang.org/go v0.11.1 // @grafana/grafana-as-code
|
cuelang.org/go v0.11.1 // @grafana/grafana-as-code
|
||||||
dario.cat/mergo v1.0.2 // @grafana/grafana-app-platform-squad
|
dario.cat/mergo v1.0.2 // @grafana/grafana-app-platform-squad
|
||||||
filippo.io/age v1.2.1 // @grafana/identity-access-team
|
filippo.io/age v1.2.1 // @grafana/identity-access-team
|
||||||
@@ -111,7 +111,7 @@ require (
|
|||||||
github.com/grafana/nanogit v0.3.0 // indirect; @grafana/grafana-git-ui-sync-team
|
github.com/grafana/nanogit v0.3.0 // indirect; @grafana/grafana-git-ui-sync-team
|
||||||
github.com/grafana/otel-profiling-go v0.5.1 // @grafana/grafana-backend-group
|
github.com/grafana/otel-profiling-go v0.5.1 // @grafana/grafana-backend-group
|
||||||
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // @grafana/observability-traces-and-profiling
|
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // @grafana/observability-traces-and-profiling
|
||||||
github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f // @grafana/observability-traces-and-profiling
|
github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae // @grafana/observability-traces-and-profiling
|
||||||
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // @grafana/grafana-search-and-storage
|
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // @grafana/grafana-search-and-storage
|
||||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // @grafana/plugins-platform-backend
|
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // @grafana/plugins-platform-backend
|
||||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // @grafana/grafana-backend-group
|
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // @grafana/grafana-backend-group
|
||||||
@@ -681,7 +681,6 @@ require (
|
|||||||
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
|
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
|
||||||
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
|
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
|
||||||
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
|
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
|
||||||
github.com/google/gnostic v0.7.1 // indirect
|
|
||||||
github.com/gophercloud/gophercloud/v2 v2.9.0 // indirect
|
github.com/gophercloud/gophercloud/v2 v2.9.0 // indirect
|
||||||
github.com/grafana/sqlds/v5 v5.0.3 // indirect
|
github.com/grafana/sqlds/v5 v5.0.3 // indirect
|
||||||
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
|
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
|
||||||
|
|||||||
@@ -627,8 +627,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS
|
|||||||
cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
|
cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
|
||||||
cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
|
cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
|
||||||
cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
|
cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
|
||||||
connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
|
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
|
||||||
connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
|
connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
|
||||||
contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs=
|
contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs=
|
||||||
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819 h1:Zh+Ur3OsoWpvALHPLT45nOekHkgOt+IOfutBbPqM17I=
|
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819 h1:Zh+Ur3OsoWpvALHPLT45nOekHkgOt+IOfutBbPqM17I=
|
||||||
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819/go.mod h1:WjmQxb+W6nVNCgj8nXrF24lIz95AHwnSl36tpjDZSU8=
|
cuelabs.dev/go/oci/ociregistry v0.0.0-20251212221603-3adeb8663819/go.mod h1:WjmQxb+W6nVNCgj8nXrF24lIz95AHwnSl36tpjDZSU8=
|
||||||
@@ -1503,8 +1503,6 @@ github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PU
|
|||||||
github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
||||||
github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
|
github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
|
||||||
github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
|
||||||
github.com/google/gnostic v0.7.1 h1:t5Kc7j/8kYr8t2u11rykRrPPovlEMG4+xdc/SpekATs=
|
|
||||||
github.com/google/gnostic v0.7.1/go.mod h1:KSw6sxnxEBFM8jLPfJd46xZP+yQcfE8XkiqfZx5zR28=
|
|
||||||
github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
|
github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
|
||||||
github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
|
github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
|
||||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||||
@@ -1687,8 +1685,8 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604
|
|||||||
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
|
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250911094103-5456b6e45604/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
|
||||||
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
|
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
|
||||||
github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
|
github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
|
||||||
github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f h1:fTlIj5n4x5dU63XHItug7GLjtnaeJdPqBlqg4zlABq0=
|
github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae h1:35W3Wjp9KWnSoV/DuymmyIj5aHE0CYlDQ5m2KeXUPAc=
|
||||||
github.com/grafana/pyroscope/api v1.2.1-0.20251118081820-ace37f973a0f/go.mod h1:VBNcIhunCZsJ3/mcYx+j7uFf0P/108eiWa+8+Z9ll3o=
|
github.com/grafana/pyroscope/api v1.2.1-0.20250415190842-3ff7247547ae/go.mod h1:6CJ1uXmLZ13ufpO9xE4pST+DyaBt0uszzrV0YnoaVLQ=
|
||||||
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
|
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
|
||||||
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
|
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
|
||||||
github.com/grafana/saml v0.4.15-0.20240917091248-ae3bbdad8a56 h1:SDGrP81Vcd102L3UJEryRd1eestRw73wt+b8vnVEFe0=
|
github.com/grafana/saml v0.4.15-0.20240917091248-ae3bbdad8a56 h1:SDGrP81Vcd102L3UJEryRd1eestRw73wt+b8vnVEFe0=
|
||||||
|
|||||||
@@ -755,8 +755,6 @@ github.com/felixge/fgprof v0.9.4/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZP
|
|||||||
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
||||||
github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
|
github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
|
||||||
github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
|
github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
|
||||||
github.com/flowstack/go-jsonschema v0.1.1 h1:dCrjGJRXIlbDsLAgTJZTjhwUJnnxVWl1OgNyYh5nyDc=
|
|
||||||
github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
|
|
||||||
github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c h1:yKN46XJHYC/gvgH2UsisJ31+n4K3S7QYZSfU2uAWjuI=
|
github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c h1:yKN46XJHYC/gvgH2UsisJ31+n4K3S7QYZSfU2uAWjuI=
|
||||||
github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c/go.mod h1:L92h+dgwElEyUuShEwjbiHjseW410WIcNz+Bjutc8YQ=
|
github.com/fluent/fluent-bit-go v0.0.0-20230731091245-a7a013e2473c/go.mod h1:L92h+dgwElEyUuShEwjbiHjseW410WIcNz+Bjutc8YQ=
|
||||||
github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
|
github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
|
||||||
|
|||||||
+4
-4
@@ -400,6 +400,10 @@ export interface FeatureToggles {
|
|||||||
*/
|
*/
|
||||||
tableSharedCrosshair?: boolean;
|
tableSharedCrosshair?: boolean;
|
||||||
/**
|
/**
|
||||||
|
* Use the kubernetes API for feature toggle management in the frontend
|
||||||
|
*/
|
||||||
|
kubernetesFeatureToggles?: boolean;
|
||||||
|
/**
|
||||||
* Enabled grafana cloud specific RBAC roles
|
* Enabled grafana cloud specific RBAC roles
|
||||||
*/
|
*/
|
||||||
cloudRBACRoles?: boolean;
|
cloudRBACRoles?: boolean;
|
||||||
@@ -1259,8 +1263,4 @@ export interface FeatureToggles {
|
|||||||
* Enables the creation of keepers that manage secrets stored on AWS secrets manager
|
* Enables the creation of keepers that manage secrets stored on AWS secrets manager
|
||||||
*/
|
*/
|
||||||
secretsManagementAppPlatformAwsKeeper?: boolean;
|
secretsManagementAppPlatformAwsKeeper?: boolean;
|
||||||
/**
|
|
||||||
* Enables profiles exemplars support in profiles drilldown
|
|
||||||
*/
|
|
||||||
profilesExemplars?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|||||||
-5
@@ -25,10 +25,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
|
|||||||
* Allows to group the results.
|
* Allows to group the results.
|
||||||
*/
|
*/
|
||||||
groupBy: Array<string>;
|
groupBy: Array<string>;
|
||||||
/**
|
|
||||||
* If set to true, exemplars will be requested
|
|
||||||
*/
|
|
||||||
includeExemplars: boolean;
|
|
||||||
/**
|
/**
|
||||||
* Specifies the query label selectors.
|
* Specifies the query label selectors.
|
||||||
*/
|
*/
|
||||||
@@ -53,7 +49,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
|
|||||||
|
|
||||||
export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
|
export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
|
||||||
groupBy: [],
|
groupBy: [],
|
||||||
includeExemplars: false,
|
|
||||||
labelSelector: '{}',
|
labelSelector: '{}',
|
||||||
spanSelector: [],
|
spanSelector: [],
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,174 +0,0 @@
|
|||||||
import { useEffect, useState } from 'react';
|
|
||||||
import { Observable } from 'rxjs';
|
|
||||||
import { map } from 'rxjs/operators';
|
|
||||||
|
|
||||||
import {
|
|
||||||
CustomVariableSupport,
|
|
||||||
DataQueryRequest,
|
|
||||||
DataQueryResponse,
|
|
||||||
QueryEditorProps,
|
|
||||||
Field,
|
|
||||||
DataFrame,
|
|
||||||
MetricFindValue,
|
|
||||||
} from '@grafana/data';
|
|
||||||
import { t } from '@grafana/i18n';
|
|
||||||
import { EditorMode, EditorRows, EditorRow, EditorField } from '@grafana/plugin-ui';
|
|
||||||
import { Combobox, ComboboxOption } from '@grafana/ui';
|
|
||||||
|
|
||||||
import { SqlQueryEditorLazy } from './components/QueryEditorLazy';
|
|
||||||
import { SqlDatasource } from './datasource/SqlDatasource';
|
|
||||||
import { applyQueryDefaults } from './defaults';
|
|
||||||
import { QueryFormat, type SQLQuery, type SQLOptions, type SQLQueryMeta } from './types';
|
|
||||||
|
|
||||||
type SQLVariableQuery = { query: string } & SQLQuery;
|
|
||||||
|
|
||||||
const refId = 'SQLVariableQueryEditor-VariableQuery';
|
|
||||||
|
|
||||||
export class SQLVariableSupport extends CustomVariableSupport<SqlDatasource, SQLQuery> {
|
|
||||||
constructor(readonly datasource: SqlDatasource) {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
editor = SQLVariablesQueryEditor;
|
|
||||||
query(request: DataQueryRequest<SQLQuery>): Observable<DataQueryResponse> {
|
|
||||||
if (request.targets.length < 1) {
|
|
||||||
throw new Error('no variable query found');
|
|
||||||
}
|
|
||||||
const updatedQuery = migrateVariableQuery(request.targets[0]);
|
|
||||||
return this.datasource.query({ ...request, targets: [updatedQuery] }).pipe(
|
|
||||||
map((d: DataQueryResponse) => {
|
|
||||||
const frames = d.data || [];
|
|
||||||
const metricFindValues = convertDataFramesToMetricFindValues(frames, updatedQuery.meta);
|
|
||||||
return { data: metricFindValues };
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
getDefaultQuery(): Partial<SQLQuery> {
|
|
||||||
return applyQueryDefaults({ refId, editorMode: EditorMode.Builder, format: QueryFormat.Table });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type SQLVariableQueryEditorProps = QueryEditorProps<SqlDatasource, SQLQuery, SQLOptions>;
|
|
||||||
|
|
||||||
const SQLVariablesQueryEditor = (props: SQLVariableQueryEditorProps) => {
|
|
||||||
const query = migrateVariableQuery(props.query);
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<SqlQueryEditorLazy {...props} query={query} />
|
|
||||||
<FieldMapping {...props} query={query} />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const FieldMapping = (props: SQLVariableQueryEditorProps) => {
|
|
||||||
const { query, datasource, onChange } = props;
|
|
||||||
const [choices, setChoices] = useState<ComboboxOption[]>([]);
|
|
||||||
useEffect(() => {
|
|
||||||
let isActive = true;
|
|
||||||
// eslint-disable-next-line
|
|
||||||
const subscription = datasource.query({ targets: [query] } as DataQueryRequest<SQLQuery>).subscribe({
|
|
||||||
next: (response) => {
|
|
||||||
if (!isActive) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const fieldNames = (response.data[0] || { fields: [] }).fields.map((f: Field) => f.name);
|
|
||||||
setChoices(fieldNames.map((f: Field) => ({ value: f, label: f })));
|
|
||||||
},
|
|
||||||
error: () => {
|
|
||||||
if (isActive) {
|
|
||||||
setChoices([]);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return () => {
|
|
||||||
isActive = false;
|
|
||||||
subscription.unsubscribe();
|
|
||||||
};
|
|
||||||
}, [datasource, query]);
|
|
||||||
const onMetaPropChange = <Key extends keyof SQLQueryMeta, Value extends SQLQueryMeta[Key]>(
|
|
||||||
key: Key,
|
|
||||||
value: Value,
|
|
||||||
meta = query.meta || {}
|
|
||||||
) => {
|
|
||||||
onChange({ ...query, meta: { ...meta, [key]: value } });
|
|
||||||
};
|
|
||||||
return (
|
|
||||||
<EditorRows>
|
|
||||||
<EditorRow>
|
|
||||||
<EditorField label={t('grafana-sql.components.query-meta.variables.valueField', 'Value Field')}>
|
|
||||||
<Combobox
|
|
||||||
isClearable
|
|
||||||
value={query.meta?.valueField}
|
|
||||||
onChange={(e) => onMetaPropChange('valueField', e?.value)}
|
|
||||||
width={40}
|
|
||||||
options={choices}
|
|
||||||
/>
|
|
||||||
</EditorField>
|
|
||||||
<EditorField label={t('grafana-sql.components.query-meta.variables.textField', 'Text Field')}>
|
|
||||||
<Combobox
|
|
||||||
isClearable
|
|
||||||
value={query.meta?.textField}
|
|
||||||
onChange={(e) => onMetaPropChange('textField', e?.value)}
|
|
||||||
width={40}
|
|
||||||
options={choices}
|
|
||||||
/>
|
|
||||||
</EditorField>
|
|
||||||
</EditorRow>
|
|
||||||
</EditorRows>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const migrateVariableQuery = (rawQuery: string | SQLQuery): SQLVariableQuery => {
|
|
||||||
if (typeof rawQuery !== 'string') {
|
|
||||||
return {
|
|
||||||
...rawQuery,
|
|
||||||
refId: rawQuery.refId || refId,
|
|
||||||
query: rawQuery.rawSql || '',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
...applyQueryDefaults({
|
|
||||||
refId,
|
|
||||||
rawSql: rawQuery,
|
|
||||||
editorMode: rawQuery ? EditorMode.Code : EditorMode.Builder,
|
|
||||||
}),
|
|
||||||
query: rawQuery,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const convertDataFramesToMetricFindValues = (frames: DataFrame[], meta?: SQLQueryMeta): MetricFindValue[] => {
|
|
||||||
if (!frames.length) {
|
|
||||||
throw new Error('no results found');
|
|
||||||
}
|
|
||||||
|
|
||||||
const frame = frames[0];
|
|
||||||
|
|
||||||
const fields = frame.fields;
|
|
||||||
|
|
||||||
if (fields.length < 1) {
|
|
||||||
throw new Error('no fields found in the response');
|
|
||||||
}
|
|
||||||
|
|
||||||
let textField = fields.find((f) => f.name === '__text');
|
|
||||||
let valueField = fields.find((f) => f.name === '__value');
|
|
||||||
if (meta?.textField) {
|
|
||||||
textField = fields.find((f) => f.name === meta.textField);
|
|
||||||
}
|
|
||||||
if (meta?.valueField) {
|
|
||||||
valueField = fields.find((f) => f.name === meta.valueField);
|
|
||||||
}
|
|
||||||
const resolvedTextField = textField || valueField || fields[0];
|
|
||||||
const resolvedValueField = valueField || textField || fields[0];
|
|
||||||
|
|
||||||
const results: MetricFindValue[] = [];
|
|
||||||
const rowCount = frame.length;
|
|
||||||
for (let i = 0; i < rowCount; i++) {
|
|
||||||
const text = String(resolvedTextField.values[i] ?? '');
|
|
||||||
const value = String(resolvedValueField.values[i] ?? '');
|
|
||||||
const properties: Record<string, string> = {};
|
|
||||||
for (const field of fields) {
|
|
||||||
properties[field.name] = String(field.values[i] ?? '');
|
|
||||||
}
|
|
||||||
results.push({ text, value, properties });
|
|
||||||
}
|
|
||||||
return results;
|
|
||||||
};
|
|
||||||
@@ -21,7 +21,6 @@ export { TLSSecretsConfig } from './components/configuration/TLSSecretsConfig';
|
|||||||
export { useMigrateDatabaseFields } from './components/configuration/useMigrateDatabaseFields';
|
export { useMigrateDatabaseFields } from './components/configuration/useMigrateDatabaseFields';
|
||||||
export { SqlQueryEditorLazy } from './components/QueryEditorLazy';
|
export { SqlQueryEditorLazy } from './components/QueryEditorLazy';
|
||||||
export type { QueryHeaderProps } from './components/QueryHeader';
|
export type { QueryHeaderProps } from './components/QueryHeader';
|
||||||
export { SQLVariableSupport } from './SQLVariableSupport';
|
|
||||||
export { createSelectClause, haveColumns } from './utils/sql.utils';
|
export { createSelectClause, haveColumns } from './utils/sql.utils';
|
||||||
export { applyQueryDefaults } from './defaults';
|
export { applyQueryDefaults } from './defaults';
|
||||||
export { makeVariable } from './utils/testHelpers';
|
export { makeVariable } from './utils/testHelpers';
|
||||||
|
|||||||
@@ -69,12 +69,6 @@
|
|||||||
"placeholder-select-format": "Select format",
|
"placeholder-select-format": "Select format",
|
||||||
"run-query": "Run query"
|
"run-query": "Run query"
|
||||||
},
|
},
|
||||||
"query-meta": {
|
|
||||||
"variables": {
|
|
||||||
"textField": "Text Field",
|
|
||||||
"valueField": "Value Field"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"query-toolbox": {
|
"query-toolbox": {
|
||||||
"content-hit-ctrlcmdreturn-to-run-query": "Hit CTRL/CMD+Return to run query",
|
"content-hit-ctrlcmdreturn-to-run-query": "Hit CTRL/CMD+Return to run query",
|
||||||
"tooltip-collapse": "Collapse editor",
|
"tooltip-collapse": "Collapse editor",
|
||||||
|
|||||||
@@ -50,8 +50,6 @@ export enum QueryFormat {
|
|||||||
Table = 'table',
|
Table = 'table',
|
||||||
}
|
}
|
||||||
|
|
||||||
export type SQLQueryMeta = { valueField?: string; textField?: string };
|
|
||||||
|
|
||||||
export interface SQLQuery extends DataQuery {
|
export interface SQLQuery extends DataQuery {
|
||||||
alias?: string;
|
alias?: string;
|
||||||
format?: QueryFormat;
|
format?: QueryFormat;
|
||||||
@@ -61,7 +59,6 @@ export interface SQLQuery extends DataQuery {
|
|||||||
sql?: SQLExpression;
|
sql?: SQLExpression;
|
||||||
editorMode?: EditorMode;
|
editorMode?: EditorMode;
|
||||||
rawQuery?: boolean;
|
rawQuery?: boolean;
|
||||||
meta?: SQLQueryMeta;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface NameValue {
|
export interface NameValue {
|
||||||
|
|||||||
@@ -32,8 +32,6 @@ func NewOpenFGAServer(cfg setting.ZanzanaServerSettings, store storage.OpenFGADa
|
|||||||
opts := []server.OpenFGAServiceV1Option{
|
opts := []server.OpenFGAServiceV1Option{
|
||||||
server.WithDatastore(store),
|
server.WithDatastore(store),
|
||||||
server.WithLogger(zlogger.New(logger)),
|
server.WithLogger(zlogger.New(logger)),
|
||||||
|
|
||||||
// Cache settings
|
|
||||||
server.WithCheckCacheLimit(cfg.CacheSettings.CheckCacheLimit),
|
server.WithCheckCacheLimit(cfg.CacheSettings.CheckCacheLimit),
|
||||||
server.WithCacheControllerEnabled(cfg.CacheSettings.CacheControllerEnabled),
|
server.WithCacheControllerEnabled(cfg.CacheSettings.CacheControllerEnabled),
|
||||||
server.WithCacheControllerTTL(cfg.CacheSettings.CacheControllerTTL),
|
server.WithCacheControllerTTL(cfg.CacheSettings.CacheControllerTTL),
|
||||||
@@ -42,25 +40,16 @@ func NewOpenFGAServer(cfg setting.ZanzanaServerSettings, store storage.OpenFGADa
|
|||||||
server.WithCheckIteratorCacheEnabled(cfg.CacheSettings.CheckIteratorCacheEnabled),
|
server.WithCheckIteratorCacheEnabled(cfg.CacheSettings.CheckIteratorCacheEnabled),
|
||||||
server.WithCheckIteratorCacheMaxResults(cfg.CacheSettings.CheckIteratorCacheMaxResults),
|
server.WithCheckIteratorCacheMaxResults(cfg.CacheSettings.CheckIteratorCacheMaxResults),
|
||||||
server.WithCheckIteratorCacheTTL(cfg.CacheSettings.CheckIteratorCacheTTL),
|
server.WithCheckIteratorCacheTTL(cfg.CacheSettings.CheckIteratorCacheTTL),
|
||||||
|
|
||||||
// ListObjects settings
|
|
||||||
server.WithListObjectsMaxResults(cfg.ListObjectsMaxResults),
|
server.WithListObjectsMaxResults(cfg.ListObjectsMaxResults),
|
||||||
server.WithListObjectsIteratorCacheEnabled(cfg.CacheSettings.ListObjectsIteratorCacheEnabled),
|
server.WithListObjectsIteratorCacheEnabled(cfg.CacheSettings.ListObjectsIteratorCacheEnabled),
|
||||||
server.WithListObjectsIteratorCacheMaxResults(cfg.CacheSettings.ListObjectsIteratorCacheMaxResults),
|
server.WithListObjectsIteratorCacheMaxResults(cfg.CacheSettings.ListObjectsIteratorCacheMaxResults),
|
||||||
server.WithListObjectsIteratorCacheTTL(cfg.CacheSettings.ListObjectsIteratorCacheTTL),
|
server.WithListObjectsIteratorCacheTTL(cfg.CacheSettings.ListObjectsIteratorCacheTTL),
|
||||||
server.WithListObjectsDeadline(cfg.ListObjectsDeadline),
|
|
||||||
|
|
||||||
// Shared iterator settings
|
|
||||||
server.WithSharedIteratorEnabled(cfg.CacheSettings.SharedIteratorEnabled),
|
server.WithSharedIteratorEnabled(cfg.CacheSettings.SharedIteratorEnabled),
|
||||||
server.WithSharedIteratorLimit(cfg.CacheSettings.SharedIteratorLimit),
|
server.WithSharedIteratorLimit(cfg.CacheSettings.SharedIteratorLimit),
|
||||||
server.WithSharedIteratorTTL(cfg.CacheSettings.SharedIteratorTTL),
|
server.WithSharedIteratorTTL(cfg.CacheSettings.SharedIteratorTTL),
|
||||||
|
server.WithListObjectsDeadline(cfg.ListObjectsDeadline),
|
||||||
server.WithContextPropagationToDatastore(true),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openfgaOpts := withOpenFGAOptions(cfg)
|
|
||||||
opts = append(opts, openfgaOpts...)
|
|
||||||
|
|
||||||
srv, err := server.NewServerWithOpts(opts...)
|
srv, err := server.NewServerWithOpts(opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -69,129 +58,6 @@ func NewOpenFGAServer(cfg setting.ZanzanaServerSettings, store storage.OpenFGADa
|
|||||||
return srv, nil
|
return srv, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func withOpenFGAOptions(cfg setting.ZanzanaServerSettings) []server.OpenFGAServiceV1Option {
|
|
||||||
opts := make([]server.OpenFGAServiceV1Option, 0)
|
|
||||||
|
|
||||||
listOpts := withListOptions(cfg)
|
|
||||||
opts = append(opts, listOpts...)
|
|
||||||
|
|
||||||
// Check settings
|
|
||||||
if cfg.OpenFgaServerSettings.MaxConcurrentReadsForCheck != 0 {
|
|
||||||
opts = append(opts, server.WithMaxConcurrentReadsForCheck(cfg.OpenFgaServerSettings.MaxConcurrentReadsForCheck))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.CheckDatabaseThrottleThreshold != 0 || cfg.OpenFgaServerSettings.CheckDatabaseThrottleDuration != 0 {
|
|
||||||
opts = append(opts, server.WithCheckDatabaseThrottle(cfg.OpenFgaServerSettings.CheckDatabaseThrottleThreshold, cfg.OpenFgaServerSettings.CheckDatabaseThrottleDuration))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Batch check settings
|
|
||||||
if cfg.OpenFgaServerSettings.MaxConcurrentChecksPerBatchCheck != 0 {
|
|
||||||
opts = append(opts, server.WithMaxConcurrentChecksPerBatchCheck(cfg.OpenFgaServerSettings.MaxConcurrentChecksPerBatchCheck))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.MaxChecksPerBatchCheck != 0 {
|
|
||||||
opts = append(opts, server.WithMaxChecksPerBatchCheck(cfg.OpenFgaServerSettings.MaxChecksPerBatchCheck))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Resolve node settings
|
|
||||||
if cfg.OpenFgaServerSettings.ResolveNodeLimit != 0 {
|
|
||||||
opts = append(opts, server.WithResolveNodeLimit(cfg.OpenFgaServerSettings.ResolveNodeLimit))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ResolveNodeBreadthLimit != 0 {
|
|
||||||
opts = append(opts, server.WithResolveNodeBreadthLimit(cfg.OpenFgaServerSettings.ResolveNodeBreadthLimit))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatch throttling settings
|
|
||||||
if cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverEnabled {
|
|
||||||
opts = append(opts, server.WithDispatchThrottlingCheckResolverEnabled(cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverEnabled))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverFrequency != 0 {
|
|
||||||
opts = append(opts, server.WithDispatchThrottlingCheckResolverFrequency(cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverFrequency))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverThreshold != 0 {
|
|
||||||
opts = append(opts, server.WithDispatchThrottlingCheckResolverThreshold(cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverThreshold))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverMaxThreshold != 0 {
|
|
||||||
opts = append(opts, server.WithDispatchThrottlingCheckResolverMaxThreshold(cfg.OpenFgaServerSettings.DispatchThrottlingCheckResolverMaxThreshold))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shadow check/query settings
|
|
||||||
if cfg.OpenFgaServerSettings.ShadowCheckResolverTimeout != 0 {
|
|
||||||
opts = append(opts, server.WithShadowCheckResolverTimeout(cfg.OpenFgaServerSettings.ShadowCheckResolverTimeout))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ShadowListObjectsQueryTimeout != 0 {
|
|
||||||
opts = append(opts, server.WithShadowListObjectsQueryTimeout(cfg.OpenFgaServerSettings.ShadowListObjectsQueryTimeout))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ShadowListObjectsQueryMaxDeltaItems != 0 {
|
|
||||||
opts = append(opts, server.WithShadowListObjectsQueryMaxDeltaItems(cfg.OpenFgaServerSettings.ShadowListObjectsQueryMaxDeltaItems))
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.OpenFgaServerSettings.RequestTimeout != 0 {
|
|
||||||
opts = append(opts, server.WithRequestTimeout(cfg.OpenFgaServerSettings.RequestTimeout))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.MaxAuthorizationModelSizeInBytes != 0 {
|
|
||||||
opts = append(opts, server.WithMaxAuthorizationModelSizeInBytes(cfg.OpenFgaServerSettings.MaxAuthorizationModelSizeInBytes))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.AuthorizationModelCacheSize != 0 {
|
|
||||||
opts = append(opts, server.WithAuthorizationModelCacheSize(cfg.OpenFgaServerSettings.AuthorizationModelCacheSize))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ChangelogHorizonOffset != 0 {
|
|
||||||
opts = append(opts, server.WithChangelogHorizonOffset(cfg.OpenFgaServerSettings.ChangelogHorizonOffset))
|
|
||||||
}
|
|
||||||
|
|
||||||
return opts
|
|
||||||
}
|
|
||||||
|
|
||||||
func withListOptions(cfg setting.ZanzanaServerSettings) []server.OpenFGAServiceV1Option {
|
|
||||||
opts := make([]server.OpenFGAServiceV1Option, 0)
|
|
||||||
|
|
||||||
// ListObjects settings
|
|
||||||
if cfg.OpenFgaServerSettings.MaxConcurrentReadsForListObjects != 0 {
|
|
||||||
opts = append(opts, server.WithMaxConcurrentReadsForListObjects(cfg.OpenFgaServerSettings.MaxConcurrentReadsForListObjects))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingEnabled {
|
|
||||||
opts = append(opts, server.WithListObjectsDispatchThrottlingEnabled(cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingEnabled))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingFrequency != 0 {
|
|
||||||
opts = append(opts, server.WithListObjectsDispatchThrottlingFrequency(cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingFrequency))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingThreshold != 0 {
|
|
||||||
opts = append(opts, server.WithListObjectsDispatchThrottlingThreshold(cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingThreshold))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingMaxThreshold != 0 {
|
|
||||||
opts = append(opts, server.WithListObjectsDispatchThrottlingMaxThreshold(cfg.OpenFgaServerSettings.ListObjectsDispatchThrottlingMaxThreshold))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListObjectsDatabaseThrottleThreshold != 0 || cfg.OpenFgaServerSettings.ListObjectsDatabaseThrottleDuration != 0 {
|
|
||||||
opts = append(opts, server.WithListObjectsDatabaseThrottle(cfg.OpenFgaServerSettings.ListObjectsDatabaseThrottleThreshold, cfg.OpenFgaServerSettings.ListObjectsDatabaseThrottleDuration))
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListUsers settings
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersDeadline != 0 {
|
|
||||||
opts = append(opts, server.WithListUsersDeadline(cfg.OpenFgaServerSettings.ListUsersDeadline))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersMaxResults != 0 {
|
|
||||||
opts = append(opts, server.WithListUsersMaxResults(cfg.OpenFgaServerSettings.ListUsersMaxResults))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.MaxConcurrentReadsForListUsers != 0 {
|
|
||||||
opts = append(opts, server.WithMaxConcurrentReadsForListUsers(cfg.OpenFgaServerSettings.MaxConcurrentReadsForListUsers))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingEnabled {
|
|
||||||
opts = append(opts, server.WithListUsersDispatchThrottlingEnabled(cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingEnabled))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingFrequency != 0 {
|
|
||||||
opts = append(opts, server.WithListUsersDispatchThrottlingFrequency(cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingFrequency))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingThreshold != 0 {
|
|
||||||
opts = append(opts, server.WithListUsersDispatchThrottlingThreshold(cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingThreshold))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingMaxThreshold != 0 {
|
|
||||||
opts = append(opts, server.WithListUsersDispatchThrottlingMaxThreshold(cfg.OpenFgaServerSettings.ListUsersDispatchThrottlingMaxThreshold))
|
|
||||||
}
|
|
||||||
if cfg.OpenFgaServerSettings.ListUsersDatabaseThrottleThreshold != 0 || cfg.OpenFgaServerSettings.ListUsersDatabaseThrottleDuration != 0 {
|
|
||||||
opts = append(opts, server.WithListUsersDatabaseThrottle(cfg.OpenFgaServerSettings.ListUsersDatabaseThrottleThreshold, cfg.OpenFgaServerSettings.ListUsersDatabaseThrottleDuration))
|
|
||||||
}
|
|
||||||
|
|
||||||
return opts
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewOpenFGAHttpServer(cfg setting.ZanzanaServerSettings, srv grpcserver.Provider) (*http.Server, error) {
|
func NewOpenFGAHttpServer(cfg setting.ZanzanaServerSettings, srv grpcserver.Provider) (*http.Server, error) {
|
||||||
dialOpts := []grpc.DialOption{
|
dialOpts := []grpc.DialOption{
|
||||||
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
||||||
|
|||||||
@@ -650,6 +650,13 @@ var (
|
|||||||
Stage: FeatureStageExperimental,
|
Stage: FeatureStageExperimental,
|
||||||
Owner: grafanaDatavizSquad,
|
Owner: grafanaDatavizSquad,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
Name: "kubernetesFeatureToggles",
|
||||||
|
Description: "Use the kubernetes API for feature toggle management in the frontend",
|
||||||
|
Stage: FeatureStageExperimental,
|
||||||
|
FrontendOnly: true,
|
||||||
|
Owner: grafanaOperatorExperienceSquad,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
Name: "cloudRBACRoles",
|
Name: "cloudRBACRoles",
|
||||||
Description: "Enabled grafana cloud specific RBAC roles",
|
Description: "Enabled grafana cloud specific RBAC roles",
|
||||||
@@ -2083,13 +2090,6 @@ var (
|
|||||||
FrontendOnly: false,
|
FrontendOnly: false,
|
||||||
Owner: grafanaOperatorExperienceSquad,
|
Owner: grafanaOperatorExperienceSquad,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
Name: "profilesExemplars",
|
|
||||||
Description: "Enables profiles exemplars support in profiles drilldown",
|
|
||||||
Stage: FeatureStageExperimental,
|
|
||||||
Owner: grafanaObservabilityTracesAndProfilingSquad,
|
|
||||||
FrontendOnly: false,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Generated
+1
-1
@@ -90,6 +90,7 @@ pdfTables,preview,@grafana/grafana-operator-experience-squad,false,false,false
|
|||||||
canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true
|
canvasPanelPanZoom,preview,@grafana/dataviz-squad,false,false,true
|
||||||
timeComparison,experimental,@grafana/dataviz-squad,false,false,true
|
timeComparison,experimental,@grafana/dataviz-squad,false,false,true
|
||||||
tableSharedCrosshair,experimental,@grafana/dataviz-squad,false,false,true
|
tableSharedCrosshair,experimental,@grafana/dataviz-squad,false,false,true
|
||||||
|
kubernetesFeatureToggles,experimental,@grafana/grafana-operator-experience-squad,false,false,true
|
||||||
cloudRBACRoles,preview,@grafana/identity-access-team,false,true,false
|
cloudRBACRoles,preview,@grafana/identity-access-team,false,true,false
|
||||||
alertingQueryOptimization,GA,@grafana/alerting-squad,false,false,false
|
alertingQueryOptimization,GA,@grafana/alerting-squad,false,false,false
|
||||||
jitterAlertRulesWithinGroups,preview,@grafana/alerting-squad,false,true,false
|
jitterAlertRulesWithinGroups,preview,@grafana/alerting-squad,false,true,false
|
||||||
@@ -282,4 +283,3 @@ useMTPlugins,experimental,@grafana/plugins-platform-backend,false,false,true
|
|||||||
multiPropsVariables,experimental,@grafana/dashboards-squad,false,false,true
|
multiPropsVariables,experimental,@grafana/dashboards-squad,false,false,true
|
||||||
smoothingTransformation,experimental,@grafana/datapro,false,false,true
|
smoothingTransformation,experimental,@grafana/datapro,false,false,true
|
||||||
secretsManagementAppPlatformAwsKeeper,experimental,@grafana/grafana-operator-experience-squad,false,false,false
|
secretsManagementAppPlatformAwsKeeper,experimental,@grafana/grafana-operator-experience-squad,false,false,false
|
||||||
profilesExemplars,experimental,@grafana/observability-traces-and-profiling,false,false,false
|
|
||||||
|
|||||||
|
Generated
-4
@@ -785,8 +785,4 @@ const (
|
|||||||
// FlagSecretsManagementAppPlatformAwsKeeper
|
// FlagSecretsManagementAppPlatformAwsKeeper
|
||||||
// Enables the creation of keepers that manage secrets stored on AWS secrets manager
|
// Enables the creation of keepers that manage secrets stored on AWS secrets manager
|
||||||
FlagSecretsManagementAppPlatformAwsKeeper = "secretsManagementAppPlatformAwsKeeper"
|
FlagSecretsManagementAppPlatformAwsKeeper = "secretsManagementAppPlatformAwsKeeper"
|
||||||
|
|
||||||
// FlagProfilesExemplars
|
|
||||||
// Enables profiles exemplars support in profiles drilldown
|
|
||||||
FlagProfilesExemplars = "profilesExemplars"
|
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-14
@@ -2044,8 +2044,7 @@
|
|||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "kubernetesFeatureToggles",
|
"name": "kubernetesFeatureToggles",
|
||||||
"resourceVersion": "1764664939750",
|
"resourceVersion": "1764664939750",
|
||||||
"creationTimestamp": "2024-01-18T05:32:44Z",
|
"creationTimestamp": "2024-01-18T05:32:44Z"
|
||||||
"deletionTimestamp": "2026-01-07T12:02:51Z"
|
|
||||||
},
|
},
|
||||||
"spec": {
|
"spec": {
|
||||||
"description": "Use the kubernetes API for feature toggle management in the frontend",
|
"description": "Use the kubernetes API for feature toggle management in the frontend",
|
||||||
@@ -2867,18 +2866,6 @@
|
|||||||
"expression": "true"
|
"expression": "true"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"metadata": {
|
|
||||||
"name": "profilesExemplars",
|
|
||||||
"resourceVersion": "1767777507980",
|
|
||||||
"creationTimestamp": "2026-01-07T09:18:27Z"
|
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"description": "Enables profiles exemplars support in profiles drilldown",
|
|
||||||
"stage": "experimental",
|
|
||||||
"codeowner": "@grafana/observability-traces-and-profiling"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "prometheusAzureOverrideAudience",
|
"name": "prometheusAzureOverrideAudience",
|
||||||
|
|||||||
@@ -77,6 +77,8 @@ type PluginInstanceCfg struct {
|
|||||||
|
|
||||||
SigV4AuthEnabled bool
|
SigV4AuthEnabled bool
|
||||||
SigV4VerboseLogging bool
|
SigV4VerboseLogging bool
|
||||||
|
|
||||||
|
LiveClientQueueMaxSize int
|
||||||
}
|
}
|
||||||
|
|
||||||
// ProvidePluginInstanceConfig returns a new PluginInstanceCfg.
|
// ProvidePluginInstanceConfig returns a new PluginInstanceCfg.
|
||||||
@@ -124,6 +126,7 @@ func ProvidePluginInstanceConfig(cfg *setting.Cfg, settingProvider setting.Provi
|
|||||||
ResponseLimit: cfg.ResponseLimit,
|
ResponseLimit: cfg.ResponseLimit,
|
||||||
SigV4AuthEnabled: cfg.SigV4AuthEnabled,
|
SigV4AuthEnabled: cfg.SigV4AuthEnabled,
|
||||||
SigV4VerboseLogging: cfg.SigV4VerboseLogging,
|
SigV4VerboseLogging: cfg.SigV4VerboseLogging,
|
||||||
|
LiveClientQueueMaxSize: cfg.LiveClientQueueMaxSize,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -198,5 +198,7 @@ func (s *RequestConfigProvider) PluginRequestConfig(ctx context.Context, pluginI
|
|||||||
m[backend.AppClientSecret] = externalService.ClientSecret
|
m[backend.AppClientSecret] = externalService.ClientSecret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m[backend.LiveClientQueueMaxSize] = strconv.Itoa(s.cfg.LiveClientQueueMaxSize)
|
||||||
|
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -259,6 +259,22 @@ func TestRequestConfigProvider_PluginRequestConfig_concurrentQueryCount(t *testi
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRequestConfigProvider_PluginRequestConfig_liveClientQueueMaxSize(t *testing.T) {
|
||||||
|
t.Run("Sets the live client queue max size only for Tempo", func(t *testing.T) {
|
||||||
|
cfg := setting.NewCfg()
|
||||||
|
cfg.LiveClientQueueMaxSize = 123
|
||||||
|
|
||||||
|
pCfg, err := ProvidePluginInstanceConfig(cfg, setting.ProvideProvider(cfg), featuremgmt.WithFeatures())
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
p := NewRequestConfigProvider(pCfg, &fakeSSOSettingsProvider{})
|
||||||
|
|
||||||
|
require.Subset(t, p.PluginRequestConfig(context.Background(), "tempo", nil), map[string]string{
|
||||||
|
"GF_LIVE_CLIENT_QUEUE_MAX_SIZE": "123",
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func TestRequestConfigProvider_PluginRequestConfig_azureAuthEnabled(t *testing.T) {
|
func TestRequestConfigProvider_PluginRequestConfig_azureAuthEnabled(t *testing.T) {
|
||||||
t.Run("Uses the configured azureAuthEnabled", func(t *testing.T) {
|
t.Run("Uses the configured azureAuthEnabled", func(t *testing.T) {
|
||||||
cfg := &PluginInstanceCfg{
|
cfg := &PluginInstanceCfg{
|
||||||
|
|||||||
@@ -37,8 +37,6 @@ type ZanzanaServerSettings struct {
|
|||||||
OpenFGAHttpAddr string
|
OpenFGAHttpAddr string
|
||||||
// Cache settings
|
// Cache settings
|
||||||
CacheSettings OpenFgaCacheSettings
|
CacheSettings OpenFgaCacheSettings
|
||||||
// OpenFGA server settings
|
|
||||||
OpenFgaServerSettings OpenFgaServerSettings
|
|
||||||
// Max number of results returned by ListObjects() query. Default is 1000.
|
// Max number of results returned by ListObjects() query. Default is 1000.
|
||||||
ListObjectsMaxResults uint32
|
ListObjectsMaxResults uint32
|
||||||
// Deadline for the ListObjects() query. Default is 3 seconds.
|
// Deadline for the ListObjects() query. Default is 3 seconds.
|
||||||
@@ -52,92 +50,6 @@ type ZanzanaServerSettings struct {
|
|||||||
AllowInsecure bool
|
AllowInsecure bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type OpenFgaServerSettings struct {
|
|
||||||
// ListObjects settings
|
|
||||||
// Max number of concurrent datastore reads for ListObjects queries
|
|
||||||
MaxConcurrentReadsForListObjects uint32
|
|
||||||
// Enable dispatch throttling for ListObjects queries
|
|
||||||
ListObjectsDispatchThrottlingEnabled bool
|
|
||||||
// Frequency for dispatch throttling in ListObjects queries
|
|
||||||
ListObjectsDispatchThrottlingFrequency time.Duration
|
|
||||||
// Threshold for dispatch throttling in ListObjects queries
|
|
||||||
ListObjectsDispatchThrottlingThreshold uint32
|
|
||||||
// Max threshold for dispatch throttling in ListObjects queries
|
|
||||||
ListObjectsDispatchThrottlingMaxThreshold uint32
|
|
||||||
// Database throttle threshold for ListObjects queries
|
|
||||||
ListObjectsDatabaseThrottleThreshold int
|
|
||||||
// Database throttle duration for ListObjects queries
|
|
||||||
ListObjectsDatabaseThrottleDuration time.Duration
|
|
||||||
|
|
||||||
// ListUsers settings
|
|
||||||
// Deadline for ListUsers queries
|
|
||||||
ListUsersDeadline time.Duration
|
|
||||||
// Max number of results returned by ListUsers queries
|
|
||||||
ListUsersMaxResults uint32
|
|
||||||
// Max number of concurrent datastore reads for ListUsers queries
|
|
||||||
MaxConcurrentReadsForListUsers uint32
|
|
||||||
// Enable dispatch throttling for ListUsers queries
|
|
||||||
ListUsersDispatchThrottlingEnabled bool
|
|
||||||
// Frequency for dispatch throttling in ListUsers queries
|
|
||||||
ListUsersDispatchThrottlingFrequency time.Duration
|
|
||||||
// Threshold for dispatch throttling in ListUsers queries
|
|
||||||
ListUsersDispatchThrottlingThreshold uint32
|
|
||||||
// Max threshold for dispatch throttling in ListUsers queries
|
|
||||||
ListUsersDispatchThrottlingMaxThreshold uint32
|
|
||||||
// Database throttle threshold for ListUsers queries
|
|
||||||
ListUsersDatabaseThrottleThreshold int
|
|
||||||
// Database throttle duration for ListUsers queries
|
|
||||||
ListUsersDatabaseThrottleDuration time.Duration
|
|
||||||
|
|
||||||
// Check settings
|
|
||||||
// Max number of concurrent datastore reads for Check queries
|
|
||||||
MaxConcurrentReadsForCheck uint32
|
|
||||||
// Database throttle threshold for Check queries
|
|
||||||
CheckDatabaseThrottleThreshold int
|
|
||||||
// Database throttle duration for Check queries
|
|
||||||
CheckDatabaseThrottleDuration time.Duration
|
|
||||||
|
|
||||||
// Batch check settings
|
|
||||||
// Max number of concurrent checks per batch check request
|
|
||||||
MaxConcurrentChecksPerBatchCheck uint32
|
|
||||||
// Max number of checks per batch check request
|
|
||||||
MaxChecksPerBatchCheck uint32
|
|
||||||
|
|
||||||
// Resolve node settings
|
|
||||||
// Max number of nodes that can be resolved in a single query
|
|
||||||
ResolveNodeLimit uint32
|
|
||||||
// Max breadth of nodes that can be resolved in a single query
|
|
||||||
ResolveNodeBreadthLimit uint32
|
|
||||||
|
|
||||||
// Dispatch throttling settings for Check resolver
|
|
||||||
// Enable dispatch throttling for Check resolver
|
|
||||||
DispatchThrottlingCheckResolverEnabled bool
|
|
||||||
// Frequency for dispatch throttling in Check resolver
|
|
||||||
DispatchThrottlingCheckResolverFrequency time.Duration
|
|
||||||
// Threshold for dispatch throttling in Check resolver
|
|
||||||
DispatchThrottlingCheckResolverThreshold uint32
|
|
||||||
// Max threshold for dispatch throttling in Check resolver
|
|
||||||
DispatchThrottlingCheckResolverMaxThreshold uint32
|
|
||||||
|
|
||||||
// Shadow check/query settings
|
|
||||||
// Timeout for shadow check resolver
|
|
||||||
ShadowCheckResolverTimeout time.Duration
|
|
||||||
// Timeout for shadow ListObjects query
|
|
||||||
ShadowListObjectsQueryTimeout time.Duration
|
|
||||||
// Max delta items for shadow ListObjects query
|
|
||||||
ShadowListObjectsQueryMaxDeltaItems int
|
|
||||||
|
|
||||||
// Request settings
|
|
||||||
// Global request timeout
|
|
||||||
RequestTimeout time.Duration
|
|
||||||
// Max size in bytes for authorization model
|
|
||||||
MaxAuthorizationModelSizeInBytes int
|
|
||||||
// Size of the authorization model cache
|
|
||||||
AuthorizationModelCacheSize int
|
|
||||||
// Offset for changelog horizon
|
|
||||||
ChangelogHorizonOffset int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parameters to configure OpenFGA cache.
|
// Parameters to configure OpenFGA cache.
|
||||||
type OpenFgaCacheSettings struct {
|
type OpenFgaCacheSettings struct {
|
||||||
// Number of items that will be kept in the in-memory cache used to resolve Check queries.
|
// Number of items that will be kept in the in-memory cache used to resolve Check queries.
|
||||||
@@ -244,56 +156,5 @@ func (cfg *Cfg) readZanzanaSettings() {
|
|||||||
zs.CacheSettings.SharedIteratorLimit = uint32(serverSec.Key("shared_iterator_limit").MustUint(1000))
|
zs.CacheSettings.SharedIteratorLimit = uint32(serverSec.Key("shared_iterator_limit").MustUint(1000))
|
||||||
zs.CacheSettings.SharedIteratorTTL = serverSec.Key("shared_iterator_ttl").MustDuration(10 * time.Second)
|
zs.CacheSettings.SharedIteratorTTL = serverSec.Key("shared_iterator_ttl").MustDuration(10 * time.Second)
|
||||||
|
|
||||||
openfgaSec := cfg.SectionWithEnvOverrides("openfga")
|
|
||||||
|
|
||||||
// ListObjects settings
|
|
||||||
zs.OpenFgaServerSettings.MaxConcurrentReadsForListObjects = uint32(openfgaSec.Key("max_concurrent_reads_for_list_objects").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ListObjectsDispatchThrottlingEnabled = openfgaSec.Key("list_objects_dispatch_throttling_enabled").MustBool(false)
|
|
||||||
zs.OpenFgaServerSettings.ListObjectsDispatchThrottlingFrequency = openfgaSec.Key("list_objects_dispatch_throttling_frequency").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.ListObjectsDispatchThrottlingThreshold = uint32(openfgaSec.Key("list_objects_dispatch_throttling_threshold").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ListObjectsDispatchThrottlingMaxThreshold = uint32(openfgaSec.Key("list_objects_dispatch_throttling_max_threshold").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ListObjectsDatabaseThrottleThreshold = openfgaSec.Key("list_objects_database_throttle_threshold").MustInt(0)
|
|
||||||
zs.OpenFgaServerSettings.ListObjectsDatabaseThrottleDuration = openfgaSec.Key("list_objects_database_throttle_duration").MustDuration(0)
|
|
||||||
|
|
||||||
// ListUsers settings
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDeadline = openfgaSec.Key("list_users_deadline").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.ListUsersMaxResults = uint32(openfgaSec.Key("list_users_max_results").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.MaxConcurrentReadsForListUsers = uint32(openfgaSec.Key("max_concurrent_reads_for_list_users").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDispatchThrottlingEnabled = openfgaSec.Key("list_users_dispatch_throttling_enabled").MustBool(false)
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDispatchThrottlingFrequency = openfgaSec.Key("list_users_dispatch_throttling_frequency").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDispatchThrottlingThreshold = uint32(openfgaSec.Key("list_users_dispatch_throttling_threshold").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDispatchThrottlingMaxThreshold = uint32(openfgaSec.Key("list_users_dispatch_throttling_max_threshold").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDatabaseThrottleThreshold = openfgaSec.Key("list_users_database_throttle_threshold").MustInt(0)
|
|
||||||
zs.OpenFgaServerSettings.ListUsersDatabaseThrottleDuration = openfgaSec.Key("list_users_database_throttle_duration").MustDuration(0)
|
|
||||||
|
|
||||||
// Check settings
|
|
||||||
zs.OpenFgaServerSettings.MaxConcurrentReadsForCheck = uint32(openfgaSec.Key("max_concurrent_reads_for_check").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.CheckDatabaseThrottleThreshold = openfgaSec.Key("check_database_throttle_threshold").MustInt(0)
|
|
||||||
zs.OpenFgaServerSettings.CheckDatabaseThrottleDuration = openfgaSec.Key("check_database_throttle_duration").MustDuration(0)
|
|
||||||
|
|
||||||
// Batch check settings
|
|
||||||
zs.OpenFgaServerSettings.MaxConcurrentChecksPerBatchCheck = uint32(openfgaSec.Key("max_concurrent_checks_per_batch_check").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.MaxChecksPerBatchCheck = uint32(openfgaSec.Key("max_checks_per_batch_check").MustUint(0))
|
|
||||||
|
|
||||||
// Resolve node settings
|
|
||||||
zs.OpenFgaServerSettings.ResolveNodeLimit = uint32(openfgaSec.Key("resolve_node_limit").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.ResolveNodeBreadthLimit = uint32(openfgaSec.Key("resolve_node_breadth_limit").MustUint(0))
|
|
||||||
|
|
||||||
// Dispatch throttling settings for Check resolver
|
|
||||||
zs.OpenFgaServerSettings.DispatchThrottlingCheckResolverEnabled = openfgaSec.Key("dispatch_throttling_check_resolver_enabled").MustBool(false)
|
|
||||||
zs.OpenFgaServerSettings.DispatchThrottlingCheckResolverFrequency = openfgaSec.Key("dispatch_throttling_check_resolver_frequency").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.DispatchThrottlingCheckResolverThreshold = uint32(openfgaSec.Key("dispatch_throttling_check_resolver_threshold").MustUint(0))
|
|
||||||
zs.OpenFgaServerSettings.DispatchThrottlingCheckResolverMaxThreshold = uint32(openfgaSec.Key("dispatch_throttling_check_resolver_max_threshold").MustUint(0))
|
|
||||||
|
|
||||||
// Shadow check/query settings
|
|
||||||
zs.OpenFgaServerSettings.ShadowCheckResolverTimeout = openfgaSec.Key("shadow_check_resolver_timeout").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.ShadowListObjectsQueryTimeout = openfgaSec.Key("shadow_list_objects_query_timeout").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.ShadowListObjectsQueryMaxDeltaItems = openfgaSec.Key("shadow_list_objects_query_max_delta_items").MustInt(0)
|
|
||||||
|
|
||||||
zs.OpenFgaServerSettings.RequestTimeout = openfgaSec.Key("request_timeout").MustDuration(0)
|
|
||||||
zs.OpenFgaServerSettings.MaxAuthorizationModelSizeInBytes = openfgaSec.Key("max_authorization_model_size_in_bytes").MustInt(0)
|
|
||||||
zs.OpenFgaServerSettings.AuthorizationModelCacheSize = openfgaSec.Key("authorization_model_cache_size").MustInt(0)
|
|
||||||
zs.OpenFgaServerSettings.ChangelogHorizonOffset = openfgaSec.Key("changelog_horizon_offset").MustInt(0)
|
|
||||||
|
|
||||||
cfg.ZanzanaServer = zs
|
cfg.ZanzanaServer = zs
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
package exemplar
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Exemplar struct {
|
|
||||||
Id string
|
|
||||||
Value float64
|
|
||||||
Timestamp int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func CreateExemplarFrame(labels map[string]string, exemplars []*Exemplar) *data.Frame {
|
|
||||||
frame := data.NewFrame("exemplar")
|
|
||||||
frame.Meta = &data.FrameMeta{
|
|
||||||
DataTopic: data.DataTopicAnnotations,
|
|
||||||
}
|
|
||||||
fields := []*data.Field{
|
|
||||||
data.NewField("Time", nil, []time.Time{}),
|
|
||||||
data.NewField("Value", labels, []float64{}), // add labels here?
|
|
||||||
data.NewField("Id", nil, []string{}),
|
|
||||||
}
|
|
||||||
fields[2].Config = &data.FieldConfig{
|
|
||||||
DisplayName: "Profile ID",
|
|
||||||
}
|
|
||||||
for name := range labels {
|
|
||||||
fields = append(fields, data.NewField(name, nil, []string{}))
|
|
||||||
}
|
|
||||||
frame.Fields = fields
|
|
||||||
|
|
||||||
for _, e := range exemplars {
|
|
||||||
frame.AppendRow(time.UnixMilli(e.Timestamp), e.Value, e.Id)
|
|
||||||
for name, value := range labels {
|
|
||||||
field, _ := frame.FieldByName(name)
|
|
||||||
if field != nil {
|
|
||||||
field.Append(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return frame
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
package exemplar
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestCreateExemplarFrame(t *testing.T) {
|
|
||||||
exemplars := []*Exemplar{
|
|
||||||
{Id: "1", Value: 1.0, Timestamp: 100},
|
|
||||||
{Id: "2", Value: 2.0, Timestamp: 200},
|
|
||||||
}
|
|
||||||
labels := map[string]string{
|
|
||||||
"foo": "bar",
|
|
||||||
}
|
|
||||||
frame := CreateExemplarFrame(labels, exemplars)
|
|
||||||
|
|
||||||
require.Equal(t, "exemplar", frame.Name)
|
|
||||||
require.Equal(t, 4, len(frame.Fields))
|
|
||||||
require.Equal(t, "Time", frame.Fields[0].Name)
|
|
||||||
require.Equal(t, "Value", frame.Fields[1].Name)
|
|
||||||
require.Equal(t, "Id", frame.Fields[2].Name)
|
|
||||||
require.Equal(t, "foo", frame.Fields[3].Name)
|
|
||||||
|
|
||||||
rows, err := frame.RowLen()
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, 2, rows)
|
|
||||||
row := frame.RowCopy(0)
|
|
||||||
require.Equal(t, 4, len(row))
|
|
||||||
require.Equal(t, 1.0, row[1])
|
|
||||||
require.Equal(t, "1", row[2])
|
|
||||||
require.Equal(t, "bar", row[3])
|
|
||||||
}
|
|
||||||
@@ -18,8 +18,6 @@ import (
|
|||||||
"github.com/prometheus/prometheus/promql/parser"
|
"github.com/prometheus/prometheus/promql/parser"
|
||||||
"go.opentelemetry.io/otel/attribute"
|
"go.opentelemetry.io/otel/attribute"
|
||||||
"go.opentelemetry.io/otel/trace"
|
"go.opentelemetry.io/otel/trace"
|
||||||
|
|
||||||
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -33,7 +31,7 @@ type ProfilingClient interface {
|
|||||||
ProfileTypes(ctx context.Context, start int64, end int64) ([]*ProfileType, error)
|
ProfileTypes(ctx context.Context, start int64, end int64) ([]*ProfileType, error)
|
||||||
LabelNames(ctx context.Context, labelSelector string, start int64, end int64) ([]string, error)
|
LabelNames(ctx context.Context, labelSelector string, start int64, end int64) ([]string, error)
|
||||||
LabelValues(ctx context.Context, label string, labelSelector string, start int64, end int64) ([]string, error)
|
LabelValues(ctx context.Context, label string, labelSelector string, start int64, end int64) ([]string, error)
|
||||||
GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64, exemplarType typesv1.ExemplarType) (*SeriesResponse, error)
|
GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64) (*SeriesResponse, error)
|
||||||
GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
|
GetProfile(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
|
||||||
GetSpanProfile(ctx context.Context, profileTypeID string, labelSelector string, spanSelector []string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
|
GetSpanProfile(ctx context.Context, profileTypeID string, labelSelector string, spanSelector []string, start int64, end int64, maxNodes *int64) (*ProfileResponse, error)
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-7
@@ -32,8 +32,6 @@ type GrafanaPyroscopeDataQuery struct {
|
|||||||
Limit *int64 `json:"limit,omitempty"`
|
Limit *int64 `json:"limit,omitempty"`
|
||||||
// Sets the maximum number of nodes in the flamegraph.
|
// Sets the maximum number of nodes in the flamegraph.
|
||||||
MaxNodes *int64 `json:"maxNodes,omitempty"`
|
MaxNodes *int64 `json:"maxNodes,omitempty"`
|
||||||
// If set to true, the response will contain annotations
|
|
||||||
Annotations *bool `json:"annotations,omitempty"`
|
|
||||||
// A unique identifier for the query within the list of targets.
|
// A unique identifier for the query within the list of targets.
|
||||||
// In server side expressions, the refId is used as a variable name to identify results.
|
// In server side expressions, the refId is used as a variable name to identify results.
|
||||||
// By default, the UI will assign A->Z; however setting meaningful names may be useful.
|
// By default, the UI will assign A->Z; however setting meaningful names may be useful.
|
||||||
@@ -43,8 +41,8 @@ type GrafanaPyroscopeDataQuery struct {
|
|||||||
// Specify the query flavor
|
// Specify the query flavor
|
||||||
// TODO make this required and give it a default
|
// TODO make this required and give it a default
|
||||||
QueryType *string `json:"queryType,omitempty"`
|
QueryType *string `json:"queryType,omitempty"`
|
||||||
// If set to true, exemplars will be requested
|
// If set to true, the response will contain annotations
|
||||||
IncludeExemplars bool `json:"includeExemplars"`
|
Annotations *bool `json:"annotations,omitempty"`
|
||||||
// For mixed data sources the selected datasource is on the query level.
|
// For mixed data sources the selected datasource is on the query level.
|
||||||
// For non mixed scenarios this is undefined.
|
// For non mixed scenarios this is undefined.
|
||||||
// TODO find a better way to do this ^ that's friendly to schema
|
// TODO find a better way to do this ^ that's friendly to schema
|
||||||
@@ -55,8 +53,7 @@ type GrafanaPyroscopeDataQuery struct {
|
|||||||
// NewGrafanaPyroscopeDataQuery creates a new GrafanaPyroscopeDataQuery object.
|
// NewGrafanaPyroscopeDataQuery creates a new GrafanaPyroscopeDataQuery object.
|
||||||
func NewGrafanaPyroscopeDataQuery() *GrafanaPyroscopeDataQuery {
|
func NewGrafanaPyroscopeDataQuery() *GrafanaPyroscopeDataQuery {
|
||||||
return &GrafanaPyroscopeDataQuery{
|
return &GrafanaPyroscopeDataQuery{
|
||||||
LabelSelector: "{}",
|
LabelSelector: "{}",
|
||||||
GroupBy: []string{},
|
GroupBy: []string{},
|
||||||
IncludeExemplars: false,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,16 +8,14 @@ import (
|
|||||||
|
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
|
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
|
||||||
|
|
||||||
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
||||||
|
|
||||||
"connectrpc.com/connect"
|
"connectrpc.com/connect"
|
||||||
|
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
|
||||||
|
"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
|
||||||
"go.opentelemetry.io/otel/attribute"
|
"go.opentelemetry.io/otel/attribute"
|
||||||
"go.opentelemetry.io/otel/codes"
|
"go.opentelemetry.io/otel/codes"
|
||||||
"go.opentelemetry.io/otel/trace"
|
"go.opentelemetry.io/otel/trace"
|
||||||
|
|
||||||
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
|
|
||||||
"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type ProfileType struct {
|
type ProfileType struct {
|
||||||
@@ -51,13 +49,6 @@ type Point struct {
|
|||||||
// Milliseconds unix timestamp
|
// Milliseconds unix timestamp
|
||||||
Timestamp int64
|
Timestamp int64
|
||||||
Annotations []*typesv1.ProfileAnnotation
|
Annotations []*typesv1.ProfileAnnotation
|
||||||
Exemplars []*Exemplar
|
|
||||||
}
|
|
||||||
|
|
||||||
type Exemplar struct {
|
|
||||||
Id string
|
|
||||||
Value uint64
|
|
||||||
Timestamp int64
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProfileResponse struct {
|
type ProfileResponse struct {
|
||||||
@@ -108,7 +99,7 @@ func (c *PyroscopeClient) ProfileTypes(ctx context.Context, start int64, end int
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64, exemplarType typesv1.ExemplarType) (*SeriesResponse, error) {
|
func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, labelSelector string, start int64, end int64, groupBy []string, limit *int64, step float64) (*SeriesResponse, error) {
|
||||||
ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.GetSeries", trace.WithAttributes(attribute.String("profileTypeID", profileTypeID), attribute.String("labelSelector", labelSelector)))
|
ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.GetSeries", trace.WithAttributes(attribute.String("profileTypeID", profileTypeID), attribute.String("labelSelector", labelSelector)))
|
||||||
defer span.End()
|
defer span.End()
|
||||||
req := connect.NewRequest(&querierv1.SelectSeriesRequest{
|
req := connect.NewRequest(&querierv1.SelectSeriesRequest{
|
||||||
@@ -119,7 +110,6 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
|
|||||||
Step: step,
|
Step: step,
|
||||||
GroupBy: groupBy,
|
GroupBy: groupBy,
|
||||||
Limit: limit,
|
Limit: limit,
|
||||||
ExemplarType: exemplarType,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
resp, err := c.connectClient.SelectSeries(ctx, req)
|
resp, err := c.connectClient.SelectSeries(ctx, req)
|
||||||
@@ -147,16 +137,6 @@ func (c *PyroscopeClient) GetSeries(ctx context.Context, profileTypeID string, l
|
|||||||
Timestamp: p.Timestamp,
|
Timestamp: p.Timestamp,
|
||||||
Annotations: p.Annotations,
|
Annotations: p.Annotations,
|
||||||
}
|
}
|
||||||
if len(p.Exemplars) > 0 {
|
|
||||||
points[i].Exemplars = make([]*Exemplar, len(p.Exemplars))
|
|
||||||
for j, e := range p.Exemplars {
|
|
||||||
points[i].Exemplars[j] = &Exemplar{
|
|
||||||
Id: e.ProfileId,
|
|
||||||
Value: e.Value,
|
|
||||||
Timestamp: e.Timestamp,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
series[i] = &Series{
|
series[i] = &Series{
|
||||||
|
|||||||
@@ -5,11 +5,10 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"connectrpc.com/connect"
|
"connectrpc.com/connect"
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
|
|
||||||
googlev1 "github.com/grafana/pyroscope/api/gen/proto/go/google/v1"
|
googlev1 "github.com/grafana/pyroscope/api/gen/proto/go/google/v1"
|
||||||
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
|
querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
|
||||||
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Test_PyroscopeClient(t *testing.T) {
|
func Test_PyroscopeClient(t *testing.T) {
|
||||||
@@ -20,7 +19,7 @@ func Test_PyroscopeClient(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("GetSeries", func(t *testing.T) {
|
t.Run("GetSeries", func(t *testing.T) {
|
||||||
limit := int64(42)
|
limit := int64(42)
|
||||||
resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, &limit, 15, typesv1.ExemplarType_EXEMPLAR_TYPE_NONE)
|
resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, &limit, 15)
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
|
|
||||||
series := &SeriesResponse{
|
series := &SeriesResponse{
|
||||||
@@ -33,21 +32,6 @@ func Test_PyroscopeClient(t *testing.T) {
|
|||||||
require.Equal(t, series, resp)
|
require.Equal(t, series, resp)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("GetSeriesWithExemplars", func(t *testing.T) {
|
|
||||||
limit := int64(42)
|
|
||||||
resp, err := client.GetSeries(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, []string{}, &limit, 15, typesv1.ExemplarType_EXEMPLAR_TYPE_INDIVIDUAL)
|
|
||||||
require.Nil(t, err)
|
|
||||||
|
|
||||||
series := &SeriesResponse{
|
|
||||||
Series: []*Series{
|
|
||||||
{Labels: []*LabelPair{{Name: "foo", Value: "bar"}}, Points: []*Point{{Timestamp: int64(1000), Value: 30, Exemplars: []*Exemplar{{Id: "id1", Value: 3, Timestamp: 1000}}}, {Timestamp: int64(2000), Value: 10, Exemplars: []*Exemplar{{Id: "id2", Value: 1, Timestamp: 2000}}}}},
|
|
||||||
},
|
|
||||||
Units: "short",
|
|
||||||
Label: "alloc_objects",
|
|
||||||
}
|
|
||||||
require.Equal(t, series, resp)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("GetProfile", func(t *testing.T) {
|
t.Run("GetProfile", func(t *testing.T) {
|
||||||
maxNodes := int64(-1)
|
maxNodes := int64(-1)
|
||||||
resp, err := client.GetProfile(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, &maxNodes)
|
resp, err := client.GetProfile(context.Background(), "memory:alloc_objects:count:space:bytes", "{}", 0, 100, &maxNodes)
|
||||||
@@ -131,21 +115,6 @@ func (f *FakePyroscopeConnectClient) SelectMergeStacktraces(ctx context.Context,
|
|||||||
|
|
||||||
func (f *FakePyroscopeConnectClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
|
func (f *FakePyroscopeConnectClient) SelectSeries(ctx context.Context, req *connect.Request[querierv1.SelectSeriesRequest]) (*connect.Response[querierv1.SelectSeriesResponse], error) {
|
||||||
f.Req = req
|
f.Req = req
|
||||||
if req.Msg.ExemplarType == typesv1.ExemplarType_EXEMPLAR_TYPE_INDIVIDUAL {
|
|
||||||
return &connect.Response[querierv1.SelectSeriesResponse]{
|
|
||||||
Msg: &querierv1.SelectSeriesResponse{
|
|
||||||
Series: []*typesv1.Series{
|
|
||||||
{
|
|
||||||
Labels: []*typesv1.LabelPair{{Name: "foo", Value: "bar"}},
|
|
||||||
Points: []*typesv1.Point{
|
|
||||||
{Timestamp: int64(1000), Value: 30, Exemplars: []*typesv1.Exemplar{{Timestamp: int64(1000), Value: 3, ProfileId: "id1"}}},
|
|
||||||
{Timestamp: int64(2000), Value: 10, Exemplars: []*typesv1.Exemplar{{Timestamp: int64(2000), Value: 1, ProfileId: "id2"}}},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
return &connect.Response[querierv1.SelectSeriesResponse]{
|
return &connect.Response[querierv1.SelectSeriesResponse]{
|
||||||
Msg: &querierv1.SelectSeriesResponse{
|
Msg: &querierv1.SelectSeriesResponse{
|
||||||
Series: []*typesv1.Series{
|
Series: []*typesv1.Series{
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import (
|
|||||||
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
|
"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/live"
|
"github.com/grafana/grafana-plugin-sdk-go/live"
|
||||||
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/exemplar"
|
|
||||||
"github.com/xlab/treeprint"
|
"github.com/xlab/treeprint"
|
||||||
"go.opentelemetry.io/otel/attribute"
|
"go.opentelemetry.io/otel/attribute"
|
||||||
"go.opentelemetry.io/otel/codes"
|
"go.opentelemetry.io/otel/codes"
|
||||||
@@ -22,8 +21,6 @@ import (
|
|||||||
|
|
||||||
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/annotation"
|
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/annotation"
|
||||||
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery"
|
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery"
|
||||||
|
|
||||||
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type queryModel struct {
|
type queryModel struct {
|
||||||
@@ -39,12 +36,8 @@ const (
|
|||||||
queryTypeProfile = string(dataquery.PyroscopeQueryTypeProfile)
|
queryTypeProfile = string(dataquery.PyroscopeQueryTypeProfile)
|
||||||
queryTypeMetrics = string(dataquery.PyroscopeQueryTypeMetrics)
|
queryTypeMetrics = string(dataquery.PyroscopeQueryTypeMetrics)
|
||||||
queryTypeBoth = string(dataquery.PyroscopeQueryTypeBoth)
|
queryTypeBoth = string(dataquery.PyroscopeQueryTypeBoth)
|
||||||
|
|
||||||
exemplarsFeatureToggle = "profilesExemplars"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var identityTransformation = func(value float64) float64 { return value }
|
|
||||||
|
|
||||||
// query processes single Pyroscope query transforming the response to data.Frame packaged in DataResponse
|
// query processes single Pyroscope query transforming the response to data.Frame packaged in DataResponse
|
||||||
func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
|
func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginContext, query backend.DataQuery) backend.DataResponse {
|
||||||
ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.query", trace.WithAttributes(attribute.String("query_type", query.QueryType)))
|
ctx, span := tracing.DefaultTracer().Start(ctx, "datasource.pyroscope.query", trace.WithAttributes(attribute.String("query_type", query.QueryType)))
|
||||||
@@ -84,10 +77,6 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
|
|||||||
logger.Error("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep, "function", logEntrypoint())
|
logger.Error("Failed to parse the MinStep using default", "MinStep", dsJson.MinStep, "function", logEntrypoint())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
exemplarType := typesv1.ExemplarType_EXEMPLAR_TYPE_NONE
|
|
||||||
if qm.IncludeExemplars && backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(exemplarsFeatureToggle) {
|
|
||||||
exemplarType = typesv1.ExemplarType_EXEMPLAR_TYPE_INDIVIDUAL
|
|
||||||
}
|
|
||||||
seriesResp, err := d.client.GetSeries(
|
seriesResp, err := d.client.GetSeries(
|
||||||
gCtx,
|
gCtx,
|
||||||
profileTypeId,
|
profileTypeId,
|
||||||
@@ -97,7 +86,6 @@ func (d *PyroscopeDatasource) query(ctx context.Context, pCtx backend.PluginCont
|
|||||||
qm.GroupBy,
|
qm.GroupBy,
|
||||||
qm.Limit,
|
qm.Limit,
|
||||||
math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
|
math.Max(query.Interval.Seconds(), parsedInterval.Seconds()),
|
||||||
exemplarType,
|
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
span.RecordError(err)
|
span.RecordError(err)
|
||||||
@@ -487,7 +475,6 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDuration
|
|||||||
annotations := make([]*annotation.TimedAnnotation, 0)
|
annotations := make([]*annotation.TimedAnnotation, 0)
|
||||||
|
|
||||||
for _, series := range resp.Series {
|
for _, series := range resp.Series {
|
||||||
exemplars := make([]*exemplar.Exemplar, 0)
|
|
||||||
// We create separate data frames as the series may not have the same length
|
// We create separate data frames as the series may not have the same length
|
||||||
frame := data.NewFrame("series")
|
frame := data.NewFrame("series")
|
||||||
frameMeta := &data.FrameMeta{PreferredVisualization: "graph"}
|
frameMeta := &data.FrameMeta{PreferredVisualization: "graph"}
|
||||||
@@ -529,20 +516,14 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDuration
|
|||||||
|
|
||||||
// Apply rate calculation for cumulative profiles
|
// Apply rate calculation for cumulative profiles
|
||||||
value := point.Value
|
value := point.Value
|
||||||
transformation := identityTransformation
|
|
||||||
if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
|
if isCumulativeProfile(profileTypeID) && stepDurationSec > 0 {
|
||||||
transformation = func(value float64) float64 {
|
value = value / stepDurationSec
|
||||||
return value / stepDurationSec
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert CPU nanoseconds to cores
|
// Convert CPU nanoseconds to cores
|
||||||
if isCPUTimeProfile(profileTypeID) {
|
if isCPUTimeProfile(profileTypeID) {
|
||||||
transformation = func(value float64) float64 {
|
value = value / 1e9
|
||||||
return value / stepDurationSec / 1e9
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
value = transformation(value)
|
|
||||||
valueField.Append(value)
|
valueField.Append(value)
|
||||||
if withAnnotations {
|
if withAnnotations {
|
||||||
for _, a := range point.Annotations {
|
for _, a := range point.Annotations {
|
||||||
@@ -552,22 +533,10 @@ func seriesToDataFrames(resp *SeriesResponse, withAnnotations bool, stepDuration
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, e := range point.Exemplars {
|
|
||||||
exemplars = append(exemplars, &exemplar.Exemplar{
|
|
||||||
Id: e.Id,
|
|
||||||
Value: transformation(float64(e.Value)),
|
|
||||||
Timestamp: e.Timestamp,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
frame.Fields = fields
|
frame.Fields = fields
|
||||||
frames = append(frames, frame)
|
frames = append(frames, frame)
|
||||||
|
|
||||||
if len(exemplars) > 0 {
|
|
||||||
frame := exemplar.CreateExemplarFrame(labels, exemplars)
|
|
||||||
frames = append(frames, frame)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(annotations) > 0 {
|
if len(annotations) > 0 {
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import (
|
|||||||
|
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||||
"github.com/grafana/grafana-plugin-sdk-go/data"
|
"github.com/grafana/grafana-plugin-sdk-go/data"
|
||||||
|
|
||||||
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
typesv1 "github.com/grafana/pyroscope/api/gen/proto/go/types/v1"
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/annotation"
|
"github.com/grafana/grafana/pkg/tsdb/grafana-pyroscope-datasource/annotation"
|
||||||
@@ -488,21 +487,10 @@ func Test_seriesToDataFrame(t *testing.T) {
|
|||||||
require.Nil(t, frames[0].Meta.Custom)
|
require.Nil(t, frames[0].Meta.Custom)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("CPU time conversion to cores with exemplars", func(t *testing.T) {
|
t.Run("CPU time conversion to cores", func(t *testing.T) {
|
||||||
series := &SeriesResponse{
|
series := &SeriesResponse{
|
||||||
Series: []*Series{
|
Series: []*Series{
|
||||||
{
|
{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 3000000000}, {Timestamp: int64(2000), Value: 1500000000}}}, // 3s and 1.5s in nanoseconds
|
||||||
Labels: []*LabelPair{}, Points: []*Point{
|
|
||||||
{
|
|
||||||
Timestamp: int64(1000), Value: 3000000000, // 3s in nanoseconds
|
|
||||||
Exemplars: []*Exemplar{{Value: 300000000, Timestamp: 1000}}, // 0.3s in nanoseconds
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Timestamp: int64(2000), Value: 1500000000, // 1.5s in nanoseconds
|
|
||||||
Exemplars: []*Exemplar{{Value: 150000000, Timestamp: 1000}}, // 0.15s in nanoseconds
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
Units: "ns",
|
Units: "ns",
|
||||||
Label: "cpu",
|
Label: "cpu",
|
||||||
@@ -510,32 +498,19 @@ func Test_seriesToDataFrame(t *testing.T) {
|
|||||||
// should convert nanoseconds to cores and set unit to "cores"
|
// should convert nanoseconds to cores and set unit to "cores"
|
||||||
frames, err := seriesToDataFrames(series, false, 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
|
frames, err := seriesToDataFrames(series, false, 15.0, "process_cpu:cpu:nanoseconds:cpu:nanoseconds")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(frames))
|
require.Equal(t, 1, len(frames))
|
||||||
|
|
||||||
require.Equal(t, "cores", frames[0].Fields[1].Config.Unit)
|
require.Equal(t, "cores", frames[0].Fields[1].Config.Unit)
|
||||||
|
|
||||||
// Check values were converted: 3000000000/15/1e9 = 0.2 cores/sec, 1500000000/15/1e9 = 0.1 cores/sec
|
// Check values were converted: 3000000000/15/1e9 = 0.2 cores/sec, 1500000000/15/1e9 = 0.1 cores/sec
|
||||||
values := fieldValues[float64](frames[0].Fields[1])
|
values := fieldValues[float64](frames[0].Fields[1])
|
||||||
require.Equal(t, []float64{0.2, 0.1}, values)
|
require.Equal(t, []float64{0.2, 0.1}, values)
|
||||||
// Check exemplar values were converted: 300000000/15/1e9 = 0.02 cores/sec, 150000000/15/1e9 = 0.01 cores/sec
|
|
||||||
exemplarValues := fieldValues[float64](frames[1].Fields[1])
|
|
||||||
require.Equal(t, []float64{0.02, 0.01}, exemplarValues)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Memory allocation unit conversion to bytes/sec", func(t *testing.T) {
|
t.Run("Memory allocation unit conversion to bytes/sec", func(t *testing.T) {
|
||||||
series := &SeriesResponse{
|
series := &SeriesResponse{
|
||||||
Series: []*Series{
|
Series: []*Series{
|
||||||
{
|
{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 150000000}, {Timestamp: int64(2000), Value: 300000000}}}, // 150 MB, 300 MB
|
||||||
Labels: []*LabelPair{}, Points: []*Point{
|
|
||||||
{
|
|
||||||
Timestamp: int64(1000), Value: 150000000, // 150 MB
|
|
||||||
Exemplars: []*Exemplar{{Value: 15000000, Timestamp: 1000}}, // 15 MB
|
|
||||||
}, {
|
|
||||||
Timestamp: int64(2000), Value: 300000000, // 300 MB
|
|
||||||
Exemplars: []*Exemplar{{Value: 30000000, Timestamp: 1000}}, // 30 MB
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
Units: "bytes",
|
Units: "bytes",
|
||||||
Label: "memory_alloc",
|
Label: "memory_alloc",
|
||||||
@@ -543,33 +518,19 @@ func Test_seriesToDataFrame(t *testing.T) {
|
|||||||
// should convert bytes to binBps and apply rate calculation
|
// should convert bytes to binBps and apply rate calculation
|
||||||
frames, err := seriesToDataFrames(series, false, 15.0, "memory:alloc_space:bytes:space:bytes")
|
frames, err := seriesToDataFrames(series, false, 15.0, "memory:alloc_space:bytes:space:bytes")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(frames))
|
require.Equal(t, 1, len(frames))
|
||||||
|
|
||||||
require.Equal(t, "binBps", frames[0].Fields[1].Config.Unit)
|
require.Equal(t, "binBps", frames[0].Fields[1].Config.Unit)
|
||||||
|
|
||||||
// Check values were rate calculated: 150000000/15 = 10000000, 300000000/15 = 20000000
|
// Check values were rate calculated: 150000000/15 = 10000000, 300000000/15 = 20000000
|
||||||
values := fieldValues[float64](frames[0].Fields[1])
|
values := fieldValues[float64](frames[0].Fields[1])
|
||||||
require.Equal(t, []float64{10000000, 20000000}, values)
|
require.Equal(t, []float64{10000000, 20000000}, values)
|
||||||
// Check exemplar values were rate calculated: 15000000/15 = 1000000, 30000000/15 = 2000000
|
|
||||||
exemplarValues := fieldValues[float64](frames[1].Fields[1])
|
|
||||||
require.Equal(t, []float64{1000000, 2000000}, exemplarValues)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Count-based profile unit conversion to ops/sec", func(t *testing.T) {
|
t.Run("Count-based profile unit conversion to ops/sec", func(t *testing.T) {
|
||||||
series := &SeriesResponse{
|
series := &SeriesResponse{
|
||||||
Series: []*Series{
|
Series: []*Series{
|
||||||
{
|
{Labels: []*LabelPair{}, Points: []*Point{{Timestamp: int64(1000), Value: 1500}, {Timestamp: int64(2000), Value: 3000}}}, // 1500, 3000 contentions
|
||||||
Labels: []*LabelPair{}, Points: []*Point{
|
|
||||||
{
|
|
||||||
Timestamp: int64(1000), Value: 1500, // 1500 contentions
|
|
||||||
Exemplars: []*Exemplar{{Value: 150, Timestamp: 1000}}, // 150 contentions
|
|
||||||
|
|
||||||
}, {
|
|
||||||
Timestamp: int64(2000), Value: 3000, // 3000 contentions
|
|
||||||
Exemplars: []*Exemplar{{Value: 300, Timestamp: 1000}}, // 300 contentions
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
Units: "short",
|
Units: "short",
|
||||||
Label: "contentions",
|
Label: "contentions",
|
||||||
@@ -577,16 +538,13 @@ func Test_seriesToDataFrame(t *testing.T) {
|
|||||||
// should convert short to ops and apply rate calculation
|
// should convert short to ops and apply rate calculation
|
||||||
frames, err := seriesToDataFrames(series, false, 15.0, "mutex:contentions:count:contentions:count")
|
frames, err := seriesToDataFrames(series, false, 15.0, "mutex:contentions:count:contentions:count")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, 2, len(frames))
|
require.Equal(t, 1, len(frames))
|
||||||
|
|
||||||
require.Equal(t, "ops", frames[0].Fields[1].Config.Unit)
|
require.Equal(t, "ops", frames[0].Fields[1].Config.Unit)
|
||||||
|
|
||||||
// Check values were rate calculated: 1500/15 = 100, 3000/15 = 200
|
// Check values were rate calculated: 1500/15 = 100, 3000/15 = 200
|
||||||
values := fieldValues[float64](frames[0].Fields[1])
|
values := fieldValues[float64](frames[0].Fields[1])
|
||||||
require.Equal(t, []float64{100, 200}, values)
|
require.Equal(t, []float64{100, 200}, values)
|
||||||
// Check exemplar values were rate calculated: 150/15 = 10, 300/15 = 20
|
|
||||||
exemplarValues := fieldValues[float64](frames[1].Fields[1])
|
|
||||||
require.Equal(t, []float64{10, 20}, exemplarValues)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -647,7 +605,7 @@ func (f *FakeClient) GetSpanProfile(ctx context.Context, profileTypeID, labelSel
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID, labelSelector string, start, end int64, groupBy []string, limit *int64, step float64, exemplarType typesv1.ExemplarType) (*SeriesResponse, error) {
|
func (f *FakeClient) GetSeries(ctx context.Context, profileTypeID, labelSelector string, start, end int64, groupBy []string, limit *int64, step float64) (*SeriesResponse, error) {
|
||||||
f.Args = []any{profileTypeID, labelSelector, start, end, groupBy, step}
|
f.Args = []any{profileTypeID, labelSelector, start, end, groupBy, step}
|
||||||
return &SeriesResponse{
|
return &SeriesResponse{
|
||||||
Series: []*Series{
|
Series: []*Series{
|
||||||
|
|||||||
+16
-1
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"google.golang.org/grpc/metadata"
|
"google.golang.org/grpc/metadata"
|
||||||
@@ -88,7 +89,21 @@ func getDialOpts(ctx context.Context, settings backend.DataSourceInstanceSetting
|
|||||||
|
|
||||||
var dialOps []grpc.DialOption
|
var dialOps []grpc.DialOption
|
||||||
|
|
||||||
dialOps = append(dialOps, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(100*1024*1024)))
|
// Default max gRPC receive size is 4MB. Tempo responses can exceed this, so we should increase it.
|
||||||
|
// Prefer `GF_LIVE_CLIENT_QUEUE_MAX_SIZE` (set by Grafana for the Tempo plugin) when it's present and valid.
|
||||||
|
const defaultMaxCallRecvMsgSizeBytes = 4 * 1024 * 1024
|
||||||
|
maxCallRecvMsgSizeBytes := defaultMaxCallRecvMsgSizeBytes
|
||||||
|
|
||||||
|
if v := backend.GrafanaConfigFromContext(ctx).Get("GF_LIVE_CLIENT_QUEUE_MAX_SIZE"); v != "" {
|
||||||
|
parsed, err := strconv.Atoi(v)
|
||||||
|
if err != nil || parsed <= 0 {
|
||||||
|
logger.Debug("Invalid GF_LIVE_CLIENT_QUEUE_MAX_SIZE; using default gRPC max receive size", "value", v, "default", defaultMaxCallRecvMsgSizeBytes, "error", err)
|
||||||
|
} else {
|
||||||
|
maxCallRecvMsgSizeBytes = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dialOps = append(dialOps, grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxCallRecvMsgSizeBytes)))
|
||||||
dialOps = append(dialOps, grpc.WithChainStreamInterceptor(CustomHeadersStreamInterceptor(opts)))
|
dialOps = append(dialOps, grpc.WithChainStreamInterceptor(CustomHeadersStreamInterceptor(opts)))
|
||||||
if settings.BasicAuthEnabled {
|
if settings.BasicAuthEnabled {
|
||||||
// If basic authentication is enabled, it uses TLS transport credentials and sets the basic authentication header for each RPC call.
|
// If basic authentication is enabled, it uses TLS transport credentials and sets the basic authentication header for each RPC call.
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ import { render, screen, userEvent, waitFor } from 'test/test-utils';
|
|||||||
import { byLabelText, byRole, byText } from 'testing-library-selector';
|
import { byLabelText, byRole, byText } from 'testing-library-selector';
|
||||||
|
|
||||||
import { setPluginLinksHook } from '@grafana/runtime';
|
import { setPluginLinksHook } from '@grafana/runtime';
|
||||||
import server from '@grafana/test-utils/server';
|
import { setupMswServer } from 'app/features/alerting/unified/mockApi';
|
||||||
import { mockAlertRuleApi, setupMswServer } from 'app/features/alerting/unified/mockApi';
|
|
||||||
import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
|
import { AlertManagerDataSourceJsonData } from 'app/plugins/datasource/alertmanager/types';
|
||||||
import { AccessControlAction } from 'app/types/accessControl';
|
import { AccessControlAction } from 'app/types/accessControl';
|
||||||
import { CombinedRule, RuleIdentifier } from 'app/types/unified-alerting';
|
import { CombinedRule, RuleIdentifier } from 'app/types/unified-alerting';
|
||||||
@@ -23,7 +22,6 @@ import {
|
|||||||
mockPluginLinkExtension,
|
mockPluginLinkExtension,
|
||||||
mockPromAlertingRule,
|
mockPromAlertingRule,
|
||||||
mockRulerGrafanaRecordingRule,
|
mockRulerGrafanaRecordingRule,
|
||||||
mockRulerGrafanaRule,
|
|
||||||
} from '../../mocks';
|
} from '../../mocks';
|
||||||
import { grafanaRulerRule } from '../../mocks/grafanaRulerApi';
|
import { grafanaRulerRule } from '../../mocks/grafanaRulerApi';
|
||||||
import { grantPermissionsHelper } from '../../test/test-utils';
|
import { grantPermissionsHelper } from '../../test/test-utils';
|
||||||
@@ -132,8 +130,6 @@ const dataSources = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
describe('RuleViewer', () => {
|
describe('RuleViewer', () => {
|
||||||
const api = mockAlertRuleApi(server);
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
setupDataSources(...Object.values(dataSources));
|
setupDataSources(...Object.values(dataSources));
|
||||||
});
|
});
|
||||||
@@ -253,22 +249,19 @@ describe('RuleViewer', () => {
|
|||||||
|
|
||||||
expect(screen.getAllByRole('row')).toHaveLength(7);
|
expect(screen.getAllByRole('row')).toHaveLength(7);
|
||||||
expect(screen.getAllByRole('row')[1]).toHaveTextContent(/6Provisioning2025-01-18 04:35:17/i);
|
expect(screen.getAllByRole('row')[1]).toHaveTextContent(/6Provisioning2025-01-18 04:35:17/i);
|
||||||
expect(screen.getAllByRole('row')[1]).toHaveTextContent('Updated by provisioning service');
|
expect(screen.getAllByRole('row')[1]).toHaveTextContent('+3-3Latest');
|
||||||
expect(screen.getAllByRole('row')[1]).toHaveTextContent('+4-3Latest');
|
|
||||||
|
|
||||||
expect(screen.getAllByRole('row')[2]).toHaveTextContent(/5Alerting2025-01-17 04:35:17/i);
|
expect(screen.getAllByRole('row')[2]).toHaveTextContent(/5Alerting2025-01-17 04:35:17/i);
|
||||||
expect(screen.getAllByRole('row')[2]).toHaveTextContent('+5-6');
|
expect(screen.getAllByRole('row')[2]).toHaveTextContent('+5-5');
|
||||||
|
|
||||||
expect(screen.getAllByRole('row')[3]).toHaveTextContent(/4different user2025-01-16 04:35:17/i);
|
expect(screen.getAllByRole('row')[3]).toHaveTextContent(/4different user2025-01-16 04:35:17/i);
|
||||||
expect(screen.getAllByRole('row')[3]).toHaveTextContent('Changed alert title and thresholds');
|
expect(screen.getAllByRole('row')[3]).toHaveTextContent('+5-5');
|
||||||
expect(screen.getAllByRole('row')[3]).toHaveTextContent('+6-5');
|
|
||||||
|
|
||||||
expect(screen.getAllByRole('row')[4]).toHaveTextContent(/3user12025-01-15 04:35:17/i);
|
expect(screen.getAllByRole('row')[4]).toHaveTextContent(/3user12025-01-15 04:35:17/i);
|
||||||
expect(screen.getAllByRole('row')[4]).toHaveTextContent('+5-10');
|
expect(screen.getAllByRole('row')[4]).toHaveTextContent('+5-9');
|
||||||
|
|
||||||
expect(screen.getAllByRole('row')[5]).toHaveTextContent(/2User ID foo2025-01-14 04:35:17/i);
|
expect(screen.getAllByRole('row')[5]).toHaveTextContent(/2User ID foo2025-01-14 04:35:17/i);
|
||||||
expect(screen.getAllByRole('row')[5]).toHaveTextContent('Updated evaluation interval and routing');
|
expect(screen.getAllByRole('row')[5]).toHaveTextContent('+11-7');
|
||||||
expect(screen.getAllByRole('row')[5]).toHaveTextContent('+12-7');
|
|
||||||
|
|
||||||
expect(screen.getAllByRole('row')[6]).toHaveTextContent(/1Unknown 2025-01-13 04:35:17/i);
|
expect(screen.getAllByRole('row')[6]).toHaveTextContent(/1Unknown 2025-01-13 04:35:17/i);
|
||||||
|
|
||||||
@@ -282,10 +275,9 @@ describe('RuleViewer', () => {
|
|||||||
await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
|
await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
|
||||||
expect(await screen.findByRole('button', { name: /Compare versions/i })).toBeDisabled();
|
expect(await screen.findByRole('button', { name: /Compare versions/i })).toBeDisabled();
|
||||||
|
|
||||||
// Check for special updated_by values - use getAllByRole since some text appears in multiple columns
|
expect(screen.getByRole('cell', { name: /provisioning/i })).toBeInTheDocument();
|
||||||
expect(screen.getAllByRole('cell', { name: /provisioning/i }).length).toBeGreaterThan(0);
|
expect(screen.getByRole('cell', { name: /alerting/i })).toBeInTheDocument();
|
||||||
expect(screen.getByRole('cell', { name: /^alerting$/i })).toBeInTheDocument();
|
expect(screen.getByRole('cell', { name: /Unknown/i })).toBeInTheDocument();
|
||||||
expect(screen.getByRole('cell', { name: /^Unknown$/i })).toBeInTheDocument();
|
|
||||||
expect(screen.getByRole('cell', { name: /user id foo/i })).toBeInTheDocument();
|
expect(screen.getByRole('cell', { name: /user id foo/i })).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -329,47 +321,6 @@ describe('RuleViewer', () => {
|
|||||||
await renderRuleViewer(rule, ruleIdentifier);
|
await renderRuleViewer(rule, ruleIdentifier);
|
||||||
expect(screen.queryByText('Labels')).not.toBeInTheDocument();
|
expect(screen.queryByText('Labels')).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('shows Notes column when versions have messages', async () => {
|
|
||||||
await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
|
|
||||||
|
|
||||||
expect(await screen.findByRole('columnheader', { name: /Notes/i })).toBeInTheDocument();
|
|
||||||
expect(screen.getAllByRole('row')).toHaveLength(7); // 1 header + 6 data rows
|
|
||||||
expect(screen.getByRole('cell', { name: /Updated by provisioning service/i })).toBeInTheDocument();
|
|
||||||
expect(screen.getByRole('cell', { name: /Changed alert title and thresholds/i })).toBeInTheDocument();
|
|
||||||
expect(screen.getByRole('cell', { name: /Updated evaluation interval and routing/i })).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('does not show Notes column when no versions have messages', async () => {
|
|
||||||
const versionsWithoutMessages = [
|
|
||||||
mockRulerGrafanaRule(
|
|
||||||
{},
|
|
||||||
{
|
|
||||||
uid: grafanaRulerRule.grafana_alert.uid,
|
|
||||||
version: 2,
|
|
||||||
updated: '2025-01-14T09:35:17.000Z',
|
|
||||||
updated_by: { uid: 'foo', name: '' },
|
|
||||||
}
|
|
||||||
),
|
|
||||||
mockRulerGrafanaRule(
|
|
||||||
{},
|
|
||||||
{
|
|
||||||
uid: grafanaRulerRule.grafana_alert.uid,
|
|
||||||
version: 1,
|
|
||||||
updated: '2025-01-13T09:35:17.000Z',
|
|
||||||
updated_by: null,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
];
|
|
||||||
api.getAlertRuleVersionHistory(grafanaRulerRule.grafana_alert.uid, versionsWithoutMessages);
|
|
||||||
|
|
||||||
await renderRuleViewer(mockRule, mockRuleIdentifier, ActiveTab.VersionHistory);
|
|
||||||
|
|
||||||
await screen.findByRole('button', { name: /Compare versions/i });
|
|
||||||
|
|
||||||
expect(screen.getAllByRole('row')).toHaveLength(3); // 1 header + 2 data rows
|
|
||||||
expect(screen.queryByRole('columnheader', { name: /Notes/i })).not.toBeInTheDocument();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+2
-24
@@ -1,9 +1,8 @@
|
|||||||
import { css } from '@emotion/css';
|
|
||||||
import { useMemo, useState } from 'react';
|
import { useMemo, useState } from 'react';
|
||||||
|
|
||||||
import { dateTimeFormat, dateTimeFormatTimeAgo } from '@grafana/data';
|
import { dateTimeFormat, dateTimeFormatTimeAgo } from '@grafana/data';
|
||||||
import { Trans, t } from '@grafana/i18n';
|
import { Trans, t } from '@grafana/i18n';
|
||||||
import { Badge, Button, Checkbox, Column, InteractiveTable, Stack, Text, useStyles2 } from '@grafana/ui';
|
import { Badge, Button, Checkbox, Column, InteractiveTable, Stack, Text } from '@grafana/ui';
|
||||||
import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
|
import { GRAFANA_RULES_SOURCE_NAME } from 'app/features/alerting/unified/utils/datasource';
|
||||||
import { computeVersionDiff } from 'app/features/alerting/unified/utils/diff';
|
import { computeVersionDiff } from 'app/features/alerting/unified/utils/diff';
|
||||||
import { RuleIdentifier } from 'app/types/unified-alerting';
|
import { RuleIdentifier } from 'app/types/unified-alerting';
|
||||||
@@ -34,7 +33,6 @@ export function VersionHistoryTable({
|
|||||||
onRestoreError,
|
onRestoreError,
|
||||||
canRestore,
|
canRestore,
|
||||||
}: VersionHistoryTableProps) {
|
}: VersionHistoryTableProps) {
|
||||||
const styles = useStyles2(getStyles);
|
|
||||||
const [showConfirmModal, setShowConfirmModal] = useState(false);
|
const [showConfirmModal, setShowConfirmModal] = useState(false);
|
||||||
const [ruleToRestore, setRuleToRestore] = useState<RulerGrafanaRuleDTO<GrafanaRuleDefinition>>();
|
const [ruleToRestore, setRuleToRestore] = useState<RulerGrafanaRuleDTO<GrafanaRuleDefinition>>();
|
||||||
const ruleToRestoreUid = ruleToRestore?.grafana_alert?.uid ?? '';
|
const ruleToRestoreUid = ruleToRestore?.grafana_alert?.uid ?? '';
|
||||||
@@ -43,8 +41,6 @@ export function VersionHistoryTable({
|
|||||||
[ruleToRestoreUid]
|
[ruleToRestoreUid]
|
||||||
);
|
);
|
||||||
|
|
||||||
const hasAnyNotes = useMemo(() => ruleVersions.some((v) => v.grafana_alert.message), [ruleVersions]);
|
|
||||||
|
|
||||||
const showConfirmation = (ruleToRestore: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
const showConfirmation = (ruleToRestore: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
||||||
setShowConfirmModal(true);
|
setShowConfirmModal(true);
|
||||||
setRuleToRestore(ruleToRestore);
|
setRuleToRestore(ruleToRestore);
|
||||||
@@ -56,15 +52,6 @@ export function VersionHistoryTable({
|
|||||||
|
|
||||||
const unknown = t('alerting.alertVersionHistory.unknown', 'Unknown');
|
const unknown = t('alerting.alertVersionHistory.unknown', 'Unknown');
|
||||||
|
|
||||||
const notesColumn: Column<RulerGrafanaRuleDTO<GrafanaRuleDefinition>> = {
|
|
||||||
id: 'notes',
|
|
||||||
header: t('core.versionHistory.table.notes', 'Notes'),
|
|
||||||
cell: ({ row }) => {
|
|
||||||
const message = row.original.grafana_alert.message;
|
|
||||||
return message || null;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const columns: Array<Column<RulerGrafanaRuleDTO<GrafanaRuleDefinition>>> = [
|
const columns: Array<Column<RulerGrafanaRuleDTO<GrafanaRuleDefinition>>> = [
|
||||||
{
|
{
|
||||||
disableGrow: true,
|
disableGrow: true,
|
||||||
@@ -104,12 +91,9 @@ export function VersionHistoryTable({
|
|||||||
if (!value) {
|
if (!value) {
|
||||||
return unknown;
|
return unknown;
|
||||||
}
|
}
|
||||||
return (
|
return dateTimeFormat(value) + ' (' + dateTimeFormatTimeAgo(value) + ')';
|
||||||
<span className={styles.nowrap}>{dateTimeFormat(value) + ' (' + dateTimeFormatTimeAgo(value) + ')'}</span>
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
...(hasAnyNotes ? [notesColumn] : []),
|
|
||||||
{
|
{
|
||||||
id: 'diff',
|
id: 'diff',
|
||||||
disableGrow: true,
|
disableGrow: true,
|
||||||
@@ -195,9 +179,3 @@ export function VersionHistoryTable({
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const getStyles = () => ({
|
|
||||||
nowrap: css({
|
|
||||||
whiteSpace: 'nowrap',
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -154,7 +154,6 @@ export const rulerRuleVersionHistoryHandler = () => {
|
|||||||
uid: 'service',
|
uid: 'service',
|
||||||
name: '',
|
name: '',
|
||||||
};
|
};
|
||||||
draft.grafana_alert.message = 'Updated by provisioning service';
|
|
||||||
}),
|
}),
|
||||||
produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
||||||
draft.grafana_alert.version = 5;
|
draft.grafana_alert.version = 5;
|
||||||
@@ -172,7 +171,6 @@ export const rulerRuleVersionHistoryHandler = () => {
|
|||||||
uid: 'different',
|
uid: 'different',
|
||||||
name: 'different user',
|
name: 'different user',
|
||||||
};
|
};
|
||||||
draft.grafana_alert.message = 'Changed alert title and thresholds';
|
|
||||||
}),
|
}),
|
||||||
produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
||||||
draft.grafana_alert.version = 3;
|
draft.grafana_alert.version = 3;
|
||||||
@@ -195,7 +193,6 @@ export const rulerRuleVersionHistoryHandler = () => {
|
|||||||
uid: 'foo',
|
uid: 'foo',
|
||||||
name: '',
|
name: '',
|
||||||
};
|
};
|
||||||
draft.grafana_alert.message = 'Updated evaluation interval and routing';
|
|
||||||
}),
|
}),
|
||||||
produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
produce(grafanaRulerRule, (draft: RulerGrafanaRuleDTO<GrafanaRuleDefinition>) => {
|
||||||
draft.grafana_alert.version = 1;
|
draft.grafana_alert.version = 1;
|
||||||
|
|||||||
@@ -284,7 +284,6 @@ function variableValueOptionsToVariableOptions(varState: MultiValueVariable['sta
|
|||||||
value: String(o.value),
|
value: String(o.value),
|
||||||
text: o.label,
|
text: o.label,
|
||||||
selected: Array.isArray(varState.value) ? varState.value.includes(o.value) : varState.value === o.value,
|
selected: Array.isArray(varState.value) ? varState.value.includes(o.value) : varState.value === o.value,
|
||||||
...(o.properties && { properties: o.properties }),
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ import {
|
|||||||
useStyles2,
|
useStyles2,
|
||||||
} from '@grafana/ui';
|
} from '@grafana/ui';
|
||||||
import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/internal';
|
import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/internal';
|
||||||
import { DATAPLANE_ID_NAME, LogsFrame } from 'app/features/logs/logsFrame';
|
import { LogsFrame } from 'app/features/logs/logsFrame';
|
||||||
|
|
||||||
import { getFieldLinksForExplore } from '../utils/links';
|
import { getFieldLinksForExplore } from '../utils/links';
|
||||||
|
|
||||||
@@ -154,9 +154,9 @@ export function LogsTable(props: Props) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
// `getLinks` and `applyFieldOverrides` are taken from TableContainer.tsx
|
// `getLinks` and `applyFieldOverrides` are taken from TableContainer.tsx
|
||||||
for (const [fieldIdx, field] of frameWithOverrides.fields.entries()) {
|
for (const [index, field] of frameWithOverrides.fields.entries()) {
|
||||||
// Hide ID field from visualization (it's only needed for row matching)
|
// Hide ID field from visualization (it's only needed for row matching)
|
||||||
if (logsFrame?.idField && (field.name === logsFrame.idField.name || field.name === DATAPLANE_ID_NAME)) {
|
if (logsFrame?.idField && (field.name === logsFrame.idField.name || field.name === 'id')) {
|
||||||
field.config = {
|
field.config = {
|
||||||
...field.config,
|
...field.config,
|
||||||
custom: {
|
custom: {
|
||||||
@@ -180,7 +180,7 @@ export function LogsTable(props: Props) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// For the first field (time), wrap the cell to include action buttons
|
// For the first field (time), wrap the cell to include action buttons
|
||||||
const isFirstField = fieldIdx === 0;
|
const isFirstField = index === 0;
|
||||||
|
|
||||||
field.config = {
|
field.config = {
|
||||||
...field.config,
|
...field.config,
|
||||||
@@ -202,6 +202,7 @@ export function LogsTable(props: Props) {
|
|||||||
panelState={props.panelState}
|
panelState={props.panelState}
|
||||||
absoluteRange={props.absoluteRange}
|
absoluteRange={props.absoluteRange}
|
||||||
logRows={props.logRows}
|
logRows={props.logRows}
|
||||||
|
rowIndex={cellProps.rowIndex}
|
||||||
/>
|
/>
|
||||||
<span className={styles.firstColumnCell}>
|
<span className={styles.firstColumnCell}>
|
||||||
{cellProps.field.display?.(cellProps.value).text ?? String(cellProps.value)}
|
{cellProps.field.display?.(cellProps.value).text ?? String(cellProps.value)}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { css } from '@emotion/css';
|
import { css } from '@emotion/css';
|
||||||
import { useCallback, useState, memo } from 'react';
|
import { useCallback, useState } from 'react';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
AbsoluteTimeRange,
|
AbsoluteTimeRange,
|
||||||
@@ -13,7 +13,7 @@ import { t } from '@grafana/i18n';
|
|||||||
import { ClipboardButton, CustomCellRendererProps, IconButton, Modal, useTheme2 } from '@grafana/ui';
|
import { ClipboardButton, CustomCellRendererProps, IconButton, Modal, useTheme2 } from '@grafana/ui';
|
||||||
import { getLogsPermalinkRange } from 'app/core/utils/shortLinks';
|
import { getLogsPermalinkRange } from 'app/core/utils/shortLinks';
|
||||||
import { getUrlStateFromPaneState } from 'app/features/explore/hooks/useStateSync';
|
import { getUrlStateFromPaneState } from 'app/features/explore/hooks/useStateSync';
|
||||||
import { LogsFrame, DATAPLANE_ID_NAME } from 'app/features/logs/logsFrame';
|
import { LogsFrame } from 'app/features/logs/logsFrame';
|
||||||
import { getState } from 'app/store/store';
|
import { getState } from 'app/store/store';
|
||||||
|
|
||||||
import { getExploreBaseUrl } from './utils/url';
|
import { getExploreBaseUrl } from './utils/url';
|
||||||
@@ -28,21 +28,26 @@ interface Props extends CustomCellRendererProps {
|
|||||||
index?: number;
|
index?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const LogsTableActionButtons = memo((props: Props) => {
|
export function LogsTableActionButtons(props: Props) {
|
||||||
const { exploreId, absoluteRange, logRows, rowIndex, panelState, displayedFields, logsFrame, frame } = props;
|
const { exploreId, absoluteRange, logRows, rowIndex, panelState, displayedFields, logsFrame, frame } = props;
|
||||||
|
|
||||||
const theme = useTheme2();
|
const theme = useTheme2();
|
||||||
const [isInspecting, setIsInspecting] = useState(false);
|
const [isInspecting, setIsInspecting] = useState(false);
|
||||||
// Get logId from the table frame (frame), not the original logsFrame, because
|
// Get logId from the table frame (frame), not the original logsFrame, because
|
||||||
// the table frame is sorted/transformed and rowIndex refers to the table frame
|
// the table frame is sorted/transformed and rowIndex refers to the table frame
|
||||||
const idFieldName = logsFrame?.idField?.name ?? DATAPLANE_ID_NAME;
|
const idFieldName = logsFrame?.idField?.name ?? 'id';
|
||||||
const idField = frame.fields.find((field) => field.name === idFieldName || field.name === DATAPLANE_ID_NAME);
|
const idField = frame.fields.find((field) => field.name === idFieldName || field.name === 'id');
|
||||||
const logId = idField?.values[rowIndex];
|
const logId = idField?.values[rowIndex];
|
||||||
|
|
||||||
const getLineValue = () => {
|
const getLineValue = () => {
|
||||||
const logRowById = logRows?.find((row) => row.rowId === logId);
|
const bodyFieldName = logsFrame?.bodyField?.name;
|
||||||
return logRowById?.raw ?? '';
|
const bodyField = bodyFieldName
|
||||||
|
? frame.fields.find((field) => field.name === bodyFieldName)
|
||||||
|
: frame.fields.find((field) => field.type === 'string');
|
||||||
|
return bodyField?.values[rowIndex];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const lineValue = getLineValue();
|
||||||
|
|
||||||
const styles = getStyles(theme);
|
const styles = getStyles(theme);
|
||||||
|
|
||||||
// Generate link to the log line
|
// Generate link to the log line
|
||||||
@@ -100,29 +105,33 @@ export const LogsTableActionButtons = memo((props: Props) => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className={styles.iconWrapper}>
|
<div className={styles.iconWrapper}>
|
||||||
<IconButton
|
<div className={styles.inspect}>
|
||||||
className={styles.icon}
|
<IconButton
|
||||||
tooltip={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
|
className={styles.inspectButton}
|
||||||
variant="secondary"
|
tooltip={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
|
||||||
aria-label={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
|
variant="secondary"
|
||||||
tooltipPlacement="top"
|
aria-label={t('explore.logs-table.action-buttons.view-log-line', 'View log line')}
|
||||||
size="md"
|
tooltipPlacement="top"
|
||||||
name="eye"
|
size="md"
|
||||||
onClick={handleViewClick}
|
name="eye"
|
||||||
tabIndex={0}
|
onClick={handleViewClick}
|
||||||
/>
|
tabIndex={0}
|
||||||
<ClipboardButton
|
/>
|
||||||
className={styles.icon}
|
</div>
|
||||||
icon="share-alt"
|
<div className={styles.inspect}>
|
||||||
variant="secondary"
|
<ClipboardButton
|
||||||
fill="text"
|
className={styles.clipboardButton}
|
||||||
size="md"
|
icon="share-alt"
|
||||||
tooltip={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
|
variant="secondary"
|
||||||
tooltipPlacement="top"
|
fill="text"
|
||||||
tabIndex={0}
|
size="md"
|
||||||
aria-label={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
|
tooltip={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
|
||||||
getText={getText}
|
tooltipPlacement="top"
|
||||||
/>
|
tabIndex={0}
|
||||||
|
aria-label={t('explore.logs-table.action-buttons.copy-link', 'Copy link to log line')}
|
||||||
|
getText={getText}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{isInspecting && (
|
{isInspecting && (
|
||||||
<Modal
|
<Modal
|
||||||
@@ -130,9 +139,9 @@ export const LogsTableActionButtons = memo((props: Props) => {
|
|||||||
isOpen={true}
|
isOpen={true}
|
||||||
title={t('explore.logs-table.action-buttons.inspect-value', 'Inspect value')}
|
title={t('explore.logs-table.action-buttons.inspect-value', 'Inspect value')}
|
||||||
>
|
>
|
||||||
<pre>{getLineValue()}</pre>
|
<pre>{lineValue}</pre>
|
||||||
<Modal.ButtonRow>
|
<Modal.ButtonRow>
|
||||||
<ClipboardButton icon="copy" getText={() => getLineValue()}>
|
<ClipboardButton icon="copy" getText={() => lineValue}>
|
||||||
{t('explore.logs-table.action-buttons.copy-to-clipboard', 'Copy to Clipboard')}
|
{t('explore.logs-table.action-buttons.copy-to-clipboard', 'Copy to Clipboard')}
|
||||||
</ClipboardButton>
|
</ClipboardButton>
|
||||||
</Modal.ButtonRow>
|
</Modal.ButtonRow>
|
||||||
@@ -140,11 +149,15 @@ export const LogsTableActionButtons = memo((props: Props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
});
|
}
|
||||||
|
|
||||||
LogsTableActionButtons.displayName = 'LogsTableActionButtons';
|
export const getStyles = (theme: GrafanaTheme2) => ({
|
||||||
|
clipboardButton: css({
|
||||||
const getStyles = (theme: GrafanaTheme2) => ({
|
height: '100%',
|
||||||
|
lineHeight: '1',
|
||||||
|
padding: 0,
|
||||||
|
width: '20px',
|
||||||
|
}),
|
||||||
iconWrapper: css({
|
iconWrapper: css({
|
||||||
background: theme.colors.background.secondary,
|
background: theme.colors.background.secondary,
|
||||||
boxShadow: theme.shadows.z2,
|
boxShadow: theme.shadows.z2,
|
||||||
@@ -153,50 +166,25 @@ const getStyles = (theme: GrafanaTheme2) => ({
|
|||||||
height: '35px',
|
height: '35px',
|
||||||
left: 0,
|
left: 0,
|
||||||
top: 0,
|
top: 0,
|
||||||
padding: 0,
|
padding: `0 ${theme.spacing(0.5)}`,
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
alignItems: 'center',
|
|
||||||
// Fix switching icon direction when cell is numeric (rtl)
|
|
||||||
direction: 'ltr',
|
|
||||||
}),
|
}),
|
||||||
icon: css({
|
inspect: css({
|
||||||
gap: 0,
|
'& button svg': {
|
||||||
margin: 0,
|
marginRight: 'auto',
|
||||||
padding: 0,
|
|
||||||
borderRadius: theme.shape.radius.default,
|
|
||||||
width: '28px',
|
|
||||||
height: '32px',
|
|
||||||
display: 'inline-flex',
|
|
||||||
justifyContent: 'center',
|
|
||||||
|
|
||||||
'&:before': {
|
|
||||||
content: '""',
|
|
||||||
position: 'absolute',
|
|
||||||
width: 24,
|
|
||||||
height: 24,
|
|
||||||
top: 0,
|
|
||||||
bottom: 0,
|
|
||||||
left: 0,
|
|
||||||
right: 0,
|
|
||||||
margin: 'auto',
|
|
||||||
borderRadius: theme.shape.radius.default,
|
|
||||||
backgroundColor: theme.colors.background.primary,
|
|
||||||
zIndex: -1,
|
|
||||||
opacity: 0,
|
|
||||||
[theme.transitions.handleMotion('no-preference', 'reduce')]: {
|
|
||||||
transitionDuration: '0.2s',
|
|
||||||
transitionTimingFunction: 'cubic-bezier(0.4, 0, 0.2, 1)',
|
|
||||||
transitionProperty: 'opacity',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
'&:hover': {
|
'&:hover': {
|
||||||
color: theme.colors.text.link,
|
color: theme.colors.text.link,
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
background: 'none',
|
|
||||||
'&:before': {
|
|
||||||
opacity: 1,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
padding: '5px 3px',
|
||||||
|
}),
|
||||||
|
inspectButton: css({
|
||||||
|
borderRadius: theme.shape.radius.default,
|
||||||
|
display: 'inline-flex',
|
||||||
|
margin: 0,
|
||||||
|
overflow: 'hidden',
|
||||||
|
verticalAlign: 'middle',
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
-1
@@ -132,7 +132,6 @@ export default function SpanFlameGraph(props: SpanFlameGraphProps) {
|
|||||||
type: profilesDataSourceSettings.type,
|
type: profilesDataSourceSettings.type,
|
||||||
uid: profilesDataSourceSettings.uid,
|
uid: profilesDataSourceSettings.uid,
|
||||||
},
|
},
|
||||||
includeExemplars: false,
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ function getField(cache: FieldCache, name: string, fieldType: FieldType): FieldW
|
|||||||
const DATAPLANE_TIMESTAMP_NAME = 'timestamp';
|
const DATAPLANE_TIMESTAMP_NAME = 'timestamp';
|
||||||
const DATAPLANE_BODY_NAME = 'body';
|
const DATAPLANE_BODY_NAME = 'body';
|
||||||
const DATAPLANE_SEVERITY_NAME = 'severity';
|
const DATAPLANE_SEVERITY_NAME = 'severity';
|
||||||
export const DATAPLANE_ID_NAME = 'id';
|
const DATAPLANE_ID_NAME = 'id';
|
||||||
const DATAPLANE_LABELS_NAME = 'labels';
|
const DATAPLANE_LABELS_NAME = 'labels';
|
||||||
|
|
||||||
// NOTE: this is a hot fn, we need to avoid allocating new objects here
|
// NOTE: this is a hot fn, we need to avoid allocating new objects here
|
||||||
|
|||||||
@@ -80,18 +80,18 @@ const buildLabelPath = (label: string) => {
|
|||||||
return label.includes('.') || label.trim().includes(' ') ? `["${label}"]` : `.${label}`;
|
return label.includes('.') || label.trim().includes(' ') ? `["${label}"]` : `.${label}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
const isRecord = (value: unknown): value is Record<string, unknown> => {
|
|
||||||
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
||||||
};
|
|
||||||
|
|
||||||
const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
|
const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
|
||||||
function collectFieldPaths(option: Record<string, unknown>, currentPath: string): string[] {
|
if (!('valuesFormat' in variable) || variable.valuesFormat !== 'json') {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
function collectFieldPaths(option: Record<string, string>, currentPath: string) {
|
||||||
let paths: string[] = [];
|
let paths: string[] = [];
|
||||||
for (const field in option) {
|
for (const field in option) {
|
||||||
if (option.hasOwnProperty(field)) {
|
if (option.hasOwnProperty(field)) {
|
||||||
const newPath = `${currentPath}.${field}`;
|
const newPath = `${currentPath}.${field}`;
|
||||||
const value = option[field];
|
const value = option[field];
|
||||||
if (isRecord(value)) {
|
if (typeof value === 'object' && value !== null) {
|
||||||
paths = [...paths, ...collectFieldPaths(value, newPath)];
|
paths = [...paths, ...collectFieldPaths(value, newPath)];
|
||||||
}
|
}
|
||||||
paths.push(newPath);
|
paths.push(newPath);
|
||||||
@@ -100,23 +100,11 @@ const getVariableValueProperties = (variable: TypedVariableModel): string[] => {
|
|||||||
return paths;
|
return paths;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('valuesFormat' in variable && variable.valuesFormat === 'json') {
|
try {
|
||||||
try {
|
return collectFieldPaths(JSON.parse(variable.query)[0], variable.name);
|
||||||
return collectFieldPaths(JSON.parse(variable.query)[0], variable.name);
|
} catch {
|
||||||
} catch {
|
return [];
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('options' in variable && Array.isArray(variable.options) && variable.options.length > 0) {
|
|
||||||
for (const opt of variable.options) {
|
|
||||||
if ('properties' in opt && isRecord(opt.properties) && Object.keys(opt.properties).length > 0) {
|
|
||||||
return collectFieldPaths(opt.properties, variable.name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getPanelLinksVariableSuggestions = (): VariableSuggestion[] => [
|
export const getPanelLinksVariableSuggestions = (): VariableSuggestion[] => [
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import {
|
|||||||
SQLQuery,
|
SQLQuery,
|
||||||
SQLSelectableValue,
|
SQLSelectableValue,
|
||||||
SqlDatasource,
|
SqlDatasource,
|
||||||
SQLVariableSupport,
|
|
||||||
formatSQL,
|
formatSQL,
|
||||||
} from '@grafana/sql';
|
} from '@grafana/sql';
|
||||||
|
|
||||||
@@ -26,7 +25,6 @@ export class PostgresDatasource extends SqlDatasource {
|
|||||||
|
|
||||||
constructor(instanceSettings: DataSourceInstanceSettings<PostgresOptions>) {
|
constructor(instanceSettings: DataSourceInstanceSettings<PostgresOptions>) {
|
||||||
super(instanceSettings);
|
super(instanceSettings);
|
||||||
this.variables = new SQLVariableSupport(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): PostgresQueryModel {
|
getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): PostgresQueryModel {
|
||||||
|
|||||||
-2
@@ -33,7 +33,6 @@ describe('QueryEditor', () => {
|
|||||||
refId: 'A',
|
refId: 'A',
|
||||||
maxNodes: 1000,
|
maxNodes: 1000,
|
||||||
groupBy: [],
|
groupBy: [],
|
||||||
includeExemplars: false,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -126,7 +125,6 @@ function setup(options: { props: Partial<Props> } = { props: {} }) {
|
|||||||
maxNodes: 1000,
|
maxNodes: 1000,
|
||||||
groupBy: [],
|
groupBy: [],
|
||||||
limit: 42,
|
limit: 42,
|
||||||
includeExemplars: false,
|
|
||||||
}}
|
}}
|
||||||
datasource={setupDs()}
|
datasource={setupDs()}
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
|
|||||||
-14
@@ -2,7 +2,6 @@ import { css } from '@emotion/css';
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
|
||||||
import { CoreApp, GrafanaTheme2, SelectableValue } from '@grafana/data';
|
import { CoreApp, GrafanaTheme2, SelectableValue } from '@grafana/data';
|
||||||
import { config } from '@grafana/runtime';
|
|
||||||
import { useStyles2, RadioButtonGroup, MultiSelect, Input, InlineSwitch } from '@grafana/ui';
|
import { useStyles2, RadioButtonGroup, MultiSelect, Input, InlineSwitch } from '@grafana/ui';
|
||||||
|
|
||||||
import { Query } from '../types';
|
import { Query } from '../types';
|
||||||
@@ -57,9 +56,6 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
|
|||||||
if (query.maxNodes) {
|
if (query.maxNodes) {
|
||||||
collapsedInfo.push(`Max nodes: ${query.maxNodes}`);
|
collapsedInfo.push(`Max nodes: ${query.maxNodes}`);
|
||||||
}
|
}
|
||||||
if (query.includeExemplars) {
|
|
||||||
collapsedInfo.push(`With exemplars`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack gap={0} direction="column">
|
<Stack gap={0} direction="column">
|
||||||
@@ -146,16 +142,6 @@ export function QueryOptions({ query, onQueryChange, app, labels }: Props) {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</EditorField>
|
</EditorField>
|
||||||
{config.featureToggles.profilesExemplars && (
|
|
||||||
<EditorField label={'Exemplars'} tooltip={<>Include profile exemplars in the time series.</>}>
|
|
||||||
<InlineSwitch
|
|
||||||
value={query.includeExemplars || false}
|
|
||||||
onChange={(event: React.SyntheticEvent<HTMLInputElement>) => {
|
|
||||||
onQueryChange({ ...query, includeExemplars: event.currentTarget.checked });
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</EditorField>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</QueryOptionGroup>
|
</QueryOptionGroup>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -42,10 +42,8 @@ composableKinds: DataQuery: {
|
|||||||
// Sets the maximum number of nodes in the flamegraph.
|
// Sets the maximum number of nodes in the flamegraph.
|
||||||
maxNodes?: int64
|
maxNodes?: int64
|
||||||
#PyroscopeQueryType: "metrics" | "profile" | *"both" @cuetsy(kind="type")
|
#PyroscopeQueryType: "metrics" | "profile" | *"both" @cuetsy(kind="type")
|
||||||
// If set to true, the response will contain annotations
|
// If set to true, the response will contain annotations
|
||||||
annotations?: bool
|
annotations?: bool
|
||||||
// If set to true, exemplars will be requested
|
|
||||||
includeExemplars: bool | *false
|
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
lenses: []
|
lenses: []
|
||||||
|
|||||||
@@ -23,10 +23,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
|
|||||||
* Allows to group the results.
|
* Allows to group the results.
|
||||||
*/
|
*/
|
||||||
groupBy: Array<string>;
|
groupBy: Array<string>;
|
||||||
/**
|
|
||||||
* If set to true, exemplars will be requested
|
|
||||||
*/
|
|
||||||
includeExemplars: boolean;
|
|
||||||
/**
|
/**
|
||||||
* Specifies the query label selectors.
|
* Specifies the query label selectors.
|
||||||
*/
|
*/
|
||||||
@@ -51,7 +47,6 @@ export interface GrafanaPyroscopeDataQuery extends common.DataQuery {
|
|||||||
|
|
||||||
export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
|
export const defaultGrafanaPyroscopeDataQuery: Partial<GrafanaPyroscopeDataQuery> = {
|
||||||
groupBy: [],
|
groupBy: [],
|
||||||
includeExemplars: false,
|
|
||||||
labelSelector: '{}',
|
labelSelector: '{}',
|
||||||
spanSelector: [],
|
spanSelector: [],
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ describe('Pyroscope data source', () => {
|
|||||||
queryType: 'both',
|
queryType: 'both',
|
||||||
profileTypeId: '',
|
profileTypeId: '',
|
||||||
groupBy: [''],
|
groupBy: [''],
|
||||||
includeExemplars: false,
|
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
expect(queries).toMatchObject([
|
expect(queries).toMatchObject([
|
||||||
@@ -119,7 +118,6 @@ describe('normalizeQuery', () => {
|
|||||||
queryType: 'metrics',
|
queryType: 'metrics',
|
||||||
profileTypeId: 'cpu',
|
profileTypeId: 'cpu',
|
||||||
refId: '',
|
refId: '',
|
||||||
includeExemplars: false,
|
|
||||||
});
|
});
|
||||||
expect(normalized).toMatchObject({
|
expect(normalized).toMatchObject({
|
||||||
labelSelector: '{app="myapp"}',
|
labelSelector: '{app="myapp"}',
|
||||||
@@ -147,7 +145,6 @@ const defaultQuery = (query: Partial<Query>): Query => {
|
|||||||
labelSelector: '',
|
labelSelector: '',
|
||||||
profileTypeId: '',
|
profileTypeId: '',
|
||||||
queryType: defaultPyroscopeQueryType,
|
queryType: defaultPyroscopeQueryType,
|
||||||
includeExemplars: false,
|
|
||||||
...query,
|
...query,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -129,7 +129,6 @@ export class PyroscopeDataSource extends DataSourceWithBackend<Query, PyroscopeD
|
|||||||
queryType: 'both',
|
queryType: 'both',
|
||||||
profileTypeId: '',
|
profileTypeId: '',
|
||||||
groupBy: [],
|
groupBy: [],
|
||||||
includeExemplars: false,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -762,19 +762,6 @@ describe('Tempo service graph view', () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should escape span with multi line content correctly', () => {
|
|
||||||
const spanContent = [
|
|
||||||
`
|
|
||||||
SELECT * from "my_table"
|
|
||||||
WHERE "data_enabled" = 1
|
|
||||||
ORDER BY "name" ASC`,
|
|
||||||
];
|
|
||||||
let escaped = getEscapedRegexValues(getEscapedValues(spanContent));
|
|
||||||
expect(escaped).toEqual([
|
|
||||||
'\\n SELECT \\\\* from \\"my_table\\"\\n WHERE \\"data_enabled\\" = 1\\n ORDER BY \\"name\\" ASC',
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should get field config correctly', () => {
|
it('should get field config correctly', () => {
|
||||||
let datasourceUid = 's4Jvz8Qnk';
|
let datasourceUid = 's4Jvz8Qnk';
|
||||||
let tempoDatasourceUid = 'EbPO1fYnz';
|
let tempoDatasourceUid = 'EbPO1fYnz';
|
||||||
|
|||||||
@@ -1168,7 +1168,7 @@ export function getEscapedRegexValues(values: string[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getEscapedValues(values: string[]) {
|
export function getEscapedValues(values: string[]) {
|
||||||
return values.map((value: string) => value.replace(/["\\]/g, '\\$&').replace(/[\n]/g, '\\n'));
|
return values.map((value: string) => value.replace(/["\\]/g, '\\$&'));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getFieldConfig(
|
export function getFieldConfig(
|
||||||
|
|||||||
@@ -293,7 +293,6 @@ export interface GrafanaRuleDefinition extends PostableGrafanaRuleDefinition {
|
|||||||
updated?: string;
|
updated?: string;
|
||||||
updated_by?: UpdatedBy | null;
|
updated_by?: UpdatedBy | null;
|
||||||
version?: number;
|
version?: number;
|
||||||
message?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// types for Grafana-managed recording and alerting rules
|
// types for Grafana-managed recording and alerting rules
|
||||||
|
|||||||
@@ -4416,7 +4416,6 @@
|
|||||||
},
|
},
|
||||||
"no-properties-changed": "No relevant properties changed",
|
"no-properties-changed": "No relevant properties changed",
|
||||||
"table": {
|
"table": {
|
||||||
"notes": "Notes",
|
|
||||||
"updated": "Date",
|
"updated": "Date",
|
||||||
"updatedBy": "Updated By",
|
"updatedBy": "Updated By",
|
||||||
"version": "Version"
|
"version": "Version"
|
||||||
|
|||||||
Reference in New Issue
Block a user