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

Core: Remove thema and kindsys dependencies (#84499)

Browse Source 
* Move some thema code inside grafana

* Use new codegen instead of thema for core kinds

* Replace TS generator

* Use new generator for go types

* Remove thema from oapi generator

* Remove thema from generators

* Don't use kindsys/thema for core kinds

* Remove kindsys/thema from plugins

* Remove last thema related

* Remove most of cuectx and move utils_ts into codegen. It also deletes wire dependency

* Merge plugins generators

* Delete thema dependency 🎉

* Fix CODEOWNERS

* Fix package name

* Fix TS output names

* More path fixes

* Fix mod codeowners

* Use original plugin's name

* Remove kindsys dependency 🎉

* Modify oapi schema and create an apply function to fix elasticsearch errors

* cue.mod was deleted by mistake

* Fix TS panels

* sort imports

* Fixing elasticsearch output

* Downgrade oapi-codegen library

* Update output ts files

* More fixes

* Restore old elasticsearch generated file and skip its generation. Remove core imports into plugins

* More lint fixes

* Add codeowners

* restore embed.go file

* Fix embed.go
This commit is contained in:
Selene
2024-03-21 11:11:29 +01:00
committed by GitHub
parent 856e410480
commit 473898e47c
56 changed files with 1433 additions and 1631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/azuremonitor/kinds/dataquery/types_dataquery_gen.go
+62 -57
View File
@@ -98,10 +98,9 @@ const (
// AppInsightsGroupByQuery defines model for AppInsightsGroupByQuery.
type AppInsightsGroupByQuery struct {
BaseGrafanaTemplateVariableQuery
Kind AppInsightsGroupByQueryKind `json:"kind"`
MetricName string `json:"metricName"`
RawQuery *string `json:"rawQuery,omitempty"`
Kind *AppInsightsGroupByQueryKind `json:"kind,omitempty"`
MetricName *string `json:"metricName,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
}
// AppInsightsGroupByQueryKind defines model for AppInsightsGroupByQuery.Kind.
@@ -109,9 +108,8 @@ type AppInsightsGroupByQueryKind string
// AppInsightsMetricNameQuery defines model for AppInsightsMetricNameQuery.
type AppInsightsMetricNameQuery struct {
BaseGrafanaTemplateVariableQuery
Kind AppInsightsMetricNameQueryKind `json:"kind"`
RawQuery *string `json:"rawQuery,omitempty"`
Kind *AppInsightsMetricNameQueryKind `json:"kind,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
}
// AppInsightsMetricNameQueryKind defines model for AppInsightsMetricNameQuery.Kind.
@@ -221,20 +219,35 @@ type AzureMonitorDataQuery = map[string]any
// AzureMonitorQuery defines model for AzureMonitorQuery.
type AzureMonitorQuery struct {
// DataQuery These are the common properties available to all queries in all datasources.
// Specific implementations will *extend* this interface, adding the required
// properties for the given context.
DataQuery
// Azure Monitor Logs sub-query properties
AzureLogAnalytics *AzureLogsQuery `json:"azureLogAnalytics,omitempty"`
AzureMonitor *AzureMetricQuery `json:"azureMonitor,omitempty"`
AzureResourceGraph *AzureResourceGraphQuery `json:"azureResourceGraph,omitempty"`
// Application Insights Traces sub-query properties
AzureTraces *AzureTracesQuery `json:"azureTraces,omitempty"`
GrafanaTemplateVariableFn *any `json:"grafanaTemplateVariableFn,omitempty"`
Namespace *string `json:"namespace,omitempty"`
AzureTraces *AzureTracesQuery `json:"azureTraces,omitempty"`
// For mixed data sources the selected datasource is on the query level.
// For non mixed scenarios this is undefined.
// TODO find a better way to do this ^ that's friendly to schema
// TODO this shouldn't be unknown but DataSourceRef | null
Datasource *any `json:"datasource,omitempty"`
GrafanaTemplateVariableFn *any `json:"grafanaTemplateVariableFn,omitempty"`
// Hide true if query is disabled (ie should not be returned to the dashboard)
// Note this does not always imply that the query should not be executed since
// the results from a hidden query may be used as the input to other queries (SSE etc)
Hide *bool `json:"hide,omitempty"`
Namespace *string `json:"namespace,omitempty"`
// Specify the query flavor
// TODO make this required and give it a default
QueryType *string `json:"queryType,omitempty"`
// 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.
// By default, the UI will assign A->Z; however setting meaningful names may be useful.
RefId *string `json:"refId,omitempty"`
// Azure Monitor query type.
// queryType: #AzureQueryType
@@ -336,15 +349,14 @@ type DataQuery struct {
// GrafanaTemplateVariableQueryType defines model for GrafanaTemplateVariableQueryType.
type GrafanaTemplateVariableQueryType string
// MetricDefinitionsQuery defines model for MetricDefinitionsQuery.
// @deprecated Use MetricNamespaceQuery instead
type MetricDefinitionsQuery struct {
BaseGrafanaTemplateVariableQuery
Kind MetricDefinitionsQueryKind `json:"kind"`
MetricNamespace *string `json:"metricNamespace,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup string `json:"resourceGroup"`
ResourceName *string `json:"resourceName,omitempty"`
Subscription string `json:"subscription"`
Kind *MetricDefinitionsQueryKind `json:"kind,omitempty"`
MetricNamespace *string `json:"metricNamespace,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup *string `json:"resourceGroup,omitempty"`
ResourceName *string `json:"resourceName,omitempty"`
Subscription *string `json:"subscription,omitempty"`
}
// MetricDefinitionsQueryKind defines model for MetricDefinitionsQuery.Kind.
@@ -352,13 +364,12 @@ type MetricDefinitionsQueryKind string
// MetricNamesQuery defines model for MetricNamesQuery.
type MetricNamesQuery struct {
BaseGrafanaTemplateVariableQuery
Kind MetricNamesQueryKind `json:"kind"`
MetricNamespace string `json:"metricNamespace"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup string `json:"resourceGroup"`
ResourceName string `json:"resourceName"`
Subscription string `json:"subscription"`
Kind *MetricNamesQueryKind `json:"kind,omitempty"`
MetricNamespace *string `json:"metricNamespace,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup *string `json:"resourceGroup,omitempty"`
ResourceName *string `json:"resourceName,omitempty"`
Subscription *string `json:"subscription,omitempty"`
}
// MetricNamesQueryKind defines model for MetricNamesQuery.Kind.
@@ -366,13 +377,12 @@ type MetricNamesQueryKind string
// MetricNamespaceQuery defines model for MetricNamespaceQuery.
type MetricNamespaceQuery struct {
BaseGrafanaTemplateVariableQuery
Kind MetricNamespaceQueryKind `json:"kind"`
MetricNamespace *string `json:"metricNamespace,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup string `json:"resourceGroup"`
ResourceName *string `json:"resourceName,omitempty"`
Subscription string `json:"subscription"`
Kind *MetricNamespaceQueryKind `json:"kind,omitempty"`
MetricNamespace *string `json:"metricNamespace,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup *string `json:"resourceGroup,omitempty"`
ResourceName *string `json:"resourceName,omitempty"`
Subscription *string `json:"subscription,omitempty"`
}
// MetricNamespaceQueryKind defines model for MetricNamespaceQuery.Kind.
@@ -380,10 +390,9 @@ type MetricNamespaceQueryKind string
// ResourceGroupsQuery defines model for ResourceGroupsQuery.
type ResourceGroupsQuery struct {
BaseGrafanaTemplateVariableQuery
Kind ResourceGroupsQueryKind `json:"kind"`
RawQuery *string `json:"rawQuery,omitempty"`
Subscription string `json:"subscription"`
Kind *ResourceGroupsQueryKind `json:"kind,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
Subscription *string `json:"subscription,omitempty"`
}
// ResourceGroupsQueryKind defines model for ResourceGroupsQuery.Kind.
@@ -391,12 +400,11 @@ type ResourceGroupsQueryKind string
// ResourceNamesQuery defines model for ResourceNamesQuery.
type ResourceNamesQuery struct {
BaseGrafanaTemplateVariableQuery
Kind ResourceNamesQueryKind `json:"kind"`
MetricNamespace string `json:"metricNamespace"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup string `json:"resourceGroup"`
Subscription string `json:"subscription"`
Kind *ResourceNamesQueryKind `json:"kind,omitempty"`
MetricNamespace *string `json:"metricNamespace,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
ResourceGroup *string `json:"resourceGroup,omitempty"`
Subscription *string `json:"subscription,omitempty"`
}
// ResourceNamesQueryKind defines model for ResourceNamesQuery.Kind.
@@ -407,9 +415,8 @@ type ResultFormat string
// SubscriptionsQuery defines model for SubscriptionsQuery.
type SubscriptionsQuery struct {
BaseGrafanaTemplateVariableQuery
Kind SubscriptionsQueryKind `json:"kind"`
RawQuery *string `json:"rawQuery,omitempty"`
Kind *SubscriptionsQueryKind `json:"kind,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
}
// SubscriptionsQueryKind defines model for SubscriptionsQuery.Kind.
@@ -417,9 +424,8 @@ type SubscriptionsQueryKind string
// UnknownQuery defines model for UnknownQuery.
type UnknownQuery struct {
BaseGrafanaTemplateVariableQuery
Kind UnknownQueryKind `json:"kind"`
RawQuery *string `json:"rawQuery,omitempty"`
Kind *UnknownQueryKind `json:"kind,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
}
// UnknownQueryKind defines model for UnknownQuery.Kind.
@@ -427,10 +433,9 @@ type UnknownQueryKind string
// WorkspacesQuery defines model for WorkspacesQuery.
type WorkspacesQuery struct {
BaseGrafanaTemplateVariableQuery
Kind WorkspacesQueryKind `json:"kind"`
RawQuery *string `json:"rawQuery,omitempty"`
Subscription string `json:"subscription"`
Kind *WorkspacesQueryKind `json:"kind,omitempty"`
RawQuery *string `json:"rawQuery,omitempty"`
Subscription *string `json:"subscription,omitempty"`
}
// WorkspacesQueryKind defines model for WorkspacesQuery.Kind.