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

Chore: Update k8s.io to v0.33.1 (#105307)

Browse Source
This commit is contained in:
Ryan McKinley
2025-05-28 00:13:18 +03:00
committed by GitHub
parent b11be2f37d
commit d4c446f42c
63 changed files with 689 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
+22 -11
View File
@@ -13,8 +13,6 @@ package dataquery
import (
json "encoding/json"
errors "errors"
fmt "fmt"
)
type AzureMonitorQuery struct {
@@ -271,7 +269,9 @@ type BuilderQueryEditorWhereExpressionArray struct {
// NewBuilderQueryEditorWhereExpressionArray creates a new BuilderQueryEditorWhereExpressionArray object.
func NewBuilderQueryEditorWhereExpressionArray() *BuilderQueryEditorWhereExpressionArray {
return &BuilderQueryEditorWhereExpressionArray{}
return &BuilderQueryEditorWhereExpressionArray{
Expressions: []BuilderQueryEditorWhereExpression{},
}
}
type BuilderQueryEditorWhereExpression struct {
@@ -281,7 +281,9 @@ type BuilderQueryEditorWhereExpression struct {
// NewBuilderQueryEditorWhereExpression creates a new BuilderQueryEditorWhereExpression object.
func NewBuilderQueryEditorWhereExpression() *BuilderQueryEditorWhereExpression {
return &BuilderQueryEditorWhereExpression{}
return &BuilderQueryEditorWhereExpression{
Expressions: []BuilderQueryEditorWhereExpressionItems{},
}
}
type BuilderQueryEditorWhereExpressionItems struct {
@@ -316,7 +318,9 @@ type BuilderQueryEditorReduceExpressionArray struct {
// NewBuilderQueryEditorReduceExpressionArray creates a new BuilderQueryEditorReduceExpressionArray object.
func NewBuilderQueryEditorReduceExpressionArray() *BuilderQueryEditorReduceExpressionArray {
return &BuilderQueryEditorReduceExpressionArray{}
return &BuilderQueryEditorReduceExpressionArray{
Expressions: []BuilderQueryEditorReduceExpression{},
}
}
type BuilderQueryEditorReduceExpression struct {
@@ -349,7 +353,9 @@ type BuilderQueryEditorGroupByExpressionArray struct {
// NewBuilderQueryEditorGroupByExpressionArray creates a new BuilderQueryEditorGroupByExpressionArray object.
func NewBuilderQueryEditorGroupByExpressionArray() *BuilderQueryEditorGroupByExpressionArray {
return &BuilderQueryEditorGroupByExpressionArray{}
return &BuilderQueryEditorGroupByExpressionArray{
Expressions: []BuilderQueryEditorGroupByExpression{},
}
}
type BuilderQueryEditorGroupByExpression struct {
@@ -371,7 +377,9 @@ type BuilderQueryEditorOrderByExpressionArray struct {
// NewBuilderQueryEditorOrderByExpressionArray creates a new BuilderQueryEditorOrderByExpressionArray object.
func NewBuilderQueryEditorOrderByExpressionArray() *BuilderQueryEditorOrderByExpressionArray {
return &BuilderQueryEditorOrderByExpressionArray{}
return &BuilderQueryEditorOrderByExpressionArray{
Expressions: []BuilderQueryEditorOrderByExpression{},
}
}
type BuilderQueryEditorOrderByExpression struct {
@@ -438,7 +446,9 @@ type AzureTracesFilter struct {
// NewAzureTracesFilter creates a new AzureTracesFilter object.
func NewAzureTracesFilter() *AzureTracesFilter {
return &AzureTracesFilter{}
return &AzureTracesFilter{
Filters: []string{},
}
}
type GrafanaTemplateVariableQuery = AppInsightsMetricNameQueryOrAppInsightsGroupByQueryOrSubscriptionsQueryOrResourceGroupsQueryOrResourceNamesQueryOrMetricNamespaceQueryOrMetricDefinitionsQueryOrMetricNamesQueryOrWorkspacesQueryOrUnknownQuery
@@ -698,7 +708,8 @@ func (resource AppInsightsMetricNameQueryOrAppInsightsGroupByQueryOrSubscription
if resource.UnknownQuery != nil {
return json.Marshal(resource.UnknownQuery)
}
return nil, fmt.Errorf("no value for disjunction of refs")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `AppInsightsMetricNameQueryOrAppInsightsGroupByQueryOrSubscriptionsQueryOrResourceGroupsQueryOrResourceNamesQueryOrMetricNamespaceQueryOrMetricDefinitionsQueryOrMetricNamesQueryOrWorkspacesQueryOrUnknownQuery` from JSON.
@@ -715,7 +726,7 @@ func (resource *AppInsightsMetricNameQueryOrAppInsightsGroupByQueryOrSubscriptio
discriminator, found := parsedAsMap["kind"]
if !found {
return errors.New("discriminator field 'kind' not found in payload")
return nil
}
switch discriminator {
@@ -801,7 +812,7 @@ func (resource *AppInsightsMetricNameQueryOrAppInsightsGroupByQueryOrSubscriptio
return nil
}
return fmt.Errorf("could not unmarshal resource with `kind = %v`", discriminator)
return nil
}
type StringOrBoolOrFloat64OrSelectableValue struct {
pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go
+3 -1
View File
@@ -261,7 +261,9 @@ type LegacyCloudMonitoringAnnotationQuery struct {
// NewLegacyCloudMonitoringAnnotationQuery creates a new LegacyCloudMonitoringAnnotationQuery object.
func NewLegacyCloudMonitoringAnnotationQuery() *LegacyCloudMonitoringAnnotationQuery {
return &LegacyCloudMonitoringAnnotationQuery{}
return &LegacyCloudMonitoringAnnotationQuery{
Filters: []string{},
}
}
// Query filter representation.
pkg/tsdb/cloudwatch/kinds/dataquery/types_dataquery_gen.go
+8 -8
View File
@@ -14,7 +14,6 @@ package dataquery
import (
json "encoding/json"
errors "errors"
fmt "fmt"
)
type MetricStat struct {
@@ -430,7 +429,7 @@ func (resource StringOrArrayOfString) MarshalJSON() ([]byte, error) {
return json.Marshal(resource.ArrayOfString)
}
return nil, fmt.Errorf("no value for disjunction of scalars")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `StringOrArrayOfString` from JSON.
@@ -482,7 +481,8 @@ func (resource QueryEditorPropertyExpressionOrQueryEditorFunctionExpression) Mar
if resource.QueryEditorFunctionExpression != nil {
return json.Marshal(resource.QueryEditorFunctionExpression)
}
return nil, fmt.Errorf("no value for disjunction of refs")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `QueryEditorPropertyExpressionOrQueryEditorFunctionExpression` from JSON.
@@ -499,7 +499,7 @@ func (resource *QueryEditorPropertyExpressionOrQueryEditorFunctionExpression) Un
discriminator, found := parsedAsMap["type"]
if !found {
return errors.New("discriminator field 'type' not found in payload")
return nil
}
switch discriminator {
@@ -521,7 +521,7 @@ func (resource *QueryEditorPropertyExpressionOrQueryEditorFunctionExpression) Un
return nil
}
return fmt.Errorf("could not unmarshal resource with `type = %v`", discriminator)
return nil
}
type ArrayOfQueryEditorExpressionOrArrayOfQueryEditorArrayExpression struct {
@@ -544,7 +544,7 @@ func (resource ArrayOfQueryEditorExpressionOrArrayOfQueryEditorArrayExpression)
return json.Marshal(resource.ArrayOfQueryEditorArrayExpression)
}
return nil, fmt.Errorf("no value for disjunction of scalars")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `ArrayOfQueryEditorExpressionOrArrayOfQueryEditorArrayExpression` from JSON.
@@ -608,7 +608,7 @@ func (resource StringOrBoolOrInt64OrArrayOfQueryEditorOperatorType) MarshalJSON(
return json.Marshal(resource.ArrayOfQueryEditorOperatorType)
}
return nil, fmt.Errorf("no value for disjunction of scalars")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `StringOrBoolOrInt64OrArrayOfQueryEditorOperatorType` from JSON.
@@ -687,7 +687,7 @@ func (resource StringOrBoolOrInt64) MarshalJSON() ([]byte, error) {
return json.Marshal(resource.Int64)
}
return nil, fmt.Errorf("no value for disjunction of scalars")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `StringOrBoolOrInt64` from JSON.
pkg/tsdb/elasticsearch/kinds/dataquery/types_dataquery_gen.go
+16 -14
View File
@@ -13,8 +13,6 @@ package dataquery
import (
json "encoding/json"
errors "errors"
fmt "fmt"
)
type BucketAggregation = DateHistogramOrHistogramOrTermsOrFiltersOrGeoHashGridOrNested
@@ -1116,7 +1114,8 @@ func (resource DateHistogramOrHistogramOrTermsOrFiltersOrGeoHashGridOrNested) Ma
if resource.Nested != nil {
return json.Marshal(resource.Nested)
}
return nil, fmt.Errorf("no value for disjunction of refs")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `DateHistogramOrHistogramOrTermsOrFiltersOrGeoHashGridOrNested` from JSON.
@@ -1133,7 +1132,7 @@ func (resource *DateHistogramOrHistogramOrTermsOrFiltersOrGeoHashGridOrNested) U
discriminator, found := parsedAsMap["type"]
if !found {
return errors.New("discriminator field 'type' not found in payload")
return nil
}
switch discriminator {
@@ -1187,7 +1186,7 @@ func (resource *DateHistogramOrHistogramOrTermsOrFiltersOrGeoHashGridOrNested) U
return nil
}
return fmt.Errorf("could not unmarshal resource with `type = %v`", discriminator)
return nil
}
type CountOrMovingAverageOrDerivativeOrCumulativeSumOrBucketScriptOrSerialDiffOrRawDataOrRawDocumentOrUniqueCountOrPercentilesOrExtendedStatsOrMinOrMaxOrSumOrAverageOrMovingFunctionOrLogsOrRateOrTopMetrics struct {
@@ -1276,7 +1275,8 @@ func (resource CountOrMovingAverageOrDerivativeOrCumulativeSumOrBucketScriptOrSe
if resource.TopMetrics != nil {
return json.Marshal(resource.TopMetrics)
}
return nil, fmt.Errorf("no value for disjunction of refs")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `CountOrMovingAverageOrDerivativeOrCumulativeSumOrBucketScriptOrSerialDiffOrRawDataOrRawDocumentOrUniqueCountOrPercentilesOrExtendedStatsOrMinOrMaxOrSumOrAverageOrMovingFunctionOrLogsOrRateOrTopMetrics` from JSON.
@@ -1293,7 +1293,7 @@ func (resource *CountOrMovingAverageOrDerivativeOrCumulativeSumOrBucketScriptOrS
discriminator, found := parsedAsMap["type"]
if !found {
return errors.New("discriminator field 'type' not found in payload")
return nil
}
switch discriminator {
@@ -1451,7 +1451,7 @@ func (resource *CountOrMovingAverageOrDerivativeOrCumulativeSumOrBucketScriptOrS
return nil
}
return fmt.Errorf("could not unmarshal resource with `type = %v`", discriminator)
return nil
}
type MovingAverageOrDerivativeOrCumulativeSumOrBucketScript struct {
@@ -1480,7 +1480,8 @@ func (resource MovingAverageOrDerivativeOrCumulativeSumOrBucketScript) MarshalJS
if resource.BucketScript != nil {
return json.Marshal(resource.BucketScript)
}
return nil, fmt.Errorf("no value for disjunction of refs")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `MovingAverageOrDerivativeOrCumulativeSumOrBucketScript` from JSON.
@@ -1497,7 +1498,7 @@ func (resource *MovingAverageOrDerivativeOrCumulativeSumOrBucketScript) Unmarsha
discriminator, found := parsedAsMap["type"]
if !found {
return errors.New("discriminator field 'type' not found in payload")
return nil
}
switch discriminator {
@@ -1535,7 +1536,7 @@ func (resource *MovingAverageOrDerivativeOrCumulativeSumOrBucketScript) Unmarsha
return nil
}
return fmt.Errorf("could not unmarshal resource with `type = %v`", discriminator)
return nil
}
type StringOrDataqueryInlineScript struct {
@@ -1630,7 +1631,8 @@ func (resource BucketScriptOrCumulativeSumOrDerivativeOrSerialDiffOrRawDataOrRaw
if resource.TopMetrics != nil {
return json.Marshal(resource.TopMetrics)
}
return nil, fmt.Errorf("no value for disjunction of refs")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `BucketScriptOrCumulativeSumOrDerivativeOrSerialDiffOrRawDataOrRawDocumentOrUniqueCountOrPercentilesOrExtendedStatsOrMinOrMaxOrSumOrAverageOrMovingAverageOrMovingFunctionOrLogsOrRateOrTopMetrics` from JSON.
@@ -1647,7 +1649,7 @@ func (resource *BucketScriptOrCumulativeSumOrDerivativeOrSerialDiffOrRawDataOrRa
discriminator, found := parsedAsMap["type"]
if !found {
return errors.New("discriminator field 'type' not found in payload")
return nil
}
switch discriminator {
@@ -1797,5 +1799,5 @@ func (resource *BucketScriptOrCumulativeSumOrDerivativeOrSerialDiffOrRawDataOrRa
return nil
}
return fmt.Errorf("could not unmarshal resource with `type = %v`", discriminator)
return nil
}
pkg/tsdb/grafana-pyroscope-datasource/kinds/dataquery/types_dataquery_gen.go
+1
View File
@@ -52,5 +52,6 @@ type GrafanaPyroscopeDataQuery struct {
func NewGrafanaPyroscopeDataQuery() *GrafanaPyroscopeDataQuery {
return &GrafanaPyroscopeDataQuery{
LabelSelector: "{}",
GroupBy: []string{},
}
}
pkg/tsdb/tempo/kinds/dataquery/types_dataquery_gen.go
+4 -3
View File
@@ -14,7 +14,6 @@ package dataquery
import (
json "encoding/json"
errors "errors"
fmt "fmt"
)
type TempoQuery struct {
@@ -67,7 +66,9 @@ type TempoQuery struct {
// NewTempoQuery creates a new TempoQuery object.
func NewTempoQuery() *TempoQuery {
return &TempoQuery{}
return &TempoQuery{
Filters: []TraceqlFilter{},
}
}
type TraceqlFilter struct {
@@ -161,7 +162,7 @@ func (resource StringOrArrayOfString) MarshalJSON() ([]byte, error) {
return json.Marshal(resource.ArrayOfString)
}
return nil, fmt.Errorf("no value for disjunction of scalars")
return []byte("null"), nil
}
// UnmarshalJSON implements a custom JSON unmarshalling logic to decode `StringOrArrayOfString` from JSON.