IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Update oapi-codegen library (#62962)

Browse Source 
* Update oapi library and thema

* Use fork commit to fix elasticsearch and cloudwatch generators

* Update thema

* Fixes

* Update thema with last fixes

* Sync

* Fix test

* Update thema and schemas

* Update thema
This commit is contained in:
Selene
2023-02-21 12:34:24 +01:00
committed by GitHub
parent 5ca8ea40c1
commit 7ace44c8b5
22 changed files with 971 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
pkg/kinds/dashboard/dashboard_types_gen.go
View File

@@ -12,47 +12,37 @@ package dashboard
// Defines values for Style.
const (
StyleDark Style = "dark"
StyleDark Style = "dark"
StyleLight Style = "light"
)
// Defines values for CursorSync.
const (
CursorSyncN0 CursorSync = 0
CursorSyncN1 CursorSync = 1
CursorSyncN2 CursorSync = 2
)
// Defines values for LinkType.
const (
LinkTypeDashboards LinkType = "dashboards"
LinkTypeLink LinkType = "link"
LinkTypeLink LinkType = "link"
)
// Defines values for FieldColorModeId.
const (
FieldColorModeIdContinuousGrYlRd FieldColorModeId = "continuous-GrYlRd"
FieldColorModeIdFixed FieldColorModeId = "fixed"
FieldColorModeIdPaletteClassic FieldColorModeId = "palette-classic"
FieldColorModeIdFixed FieldColorModeId = "fixed"
FieldColorModeIdPaletteClassic FieldColorModeId = "palette-classic"
FieldColorModeIdPaletteSaturated FieldColorModeId = "palette-saturated"
FieldColorModeIdThresholds FieldColorModeId = "thresholds"
FieldColorModeIdThresholds FieldColorModeId = "thresholds"
)
// Defines values for FieldColorSeriesByMode.
const (
FieldColorSeriesByModeLast FieldColorSeriesByMode = "last"
FieldColorSeriesByModeMax FieldColorSeriesByMode = "max"
FieldColorSeriesByModeMin FieldColorSeriesByMode = "min"
FieldColorSeriesByModeMax FieldColorSeriesByMode = "max"
FieldColorSeriesByModeMin FieldColorSeriesByMode = "min"
)
// Defines values for GraphPanelType.
@@ -67,35 +57,43 @@ const (
// Defines values for LoadingState.
const (
LoadingStateDone LoadingState = "Done"
LoadingStateError LoadingState = "Error"
LoadingStateLoading LoadingState = "Loading"
LoadingStateDone LoadingState = "Done"
LoadingStateError LoadingState = "Error"
LoadingStateLoading LoadingState = "Loading"
LoadingStateNotStarted LoadingState = "NotStarted"
LoadingStateStreaming LoadingState = "Streaming"
LoadingStateStreaming LoadingState = "Streaming"
)
// Defines values for MappingType.
const (
MappingTypeRange MappingType = "range"
MappingTypeRegex MappingType = "regex"
MappingTypeRange MappingType = "range"
MappingTypeRegex MappingType = "regex"
MappingTypeSpecial MappingType = "special"
MappingTypeValue MappingType = "value"
MappingTypeValue MappingType = "value"
)
// Defines values for PanelRepeatDirection.
const (
PanelRepeatDirectionH PanelRepeatDirection = "h"
PanelRepeatDirectionV PanelRepeatDirection = "v"
)
// Defines values for RangeMapType.
const (
RangeMapTypeRange RangeMapType = "range"
RangeMapTypeRegex RangeMapType = "regex"
RangeMapTypeSpecial RangeMapType = "special"
RangeMapTypeValue RangeMapType = "value"
)
// Defines values for RegexMapType.
const (
RegexMapTypeRange RegexMapType = "range"
RegexMapTypeRegex RegexMapType = "regex"
RegexMapTypeSpecial RegexMapType = "special"
RegexMapTypeValue RegexMapType = "value"
)
// Defines values for RowPanelType.
const (
RowPanelTypeRow RowPanelType = "row"
@@ -104,58 +102,58 @@ const (
// Defines values for SpecialValueMapOptionsMatch.
const (
SpecialValueMapOptionsMatchFalse SpecialValueMapOptionsMatch = "false"
SpecialValueMapOptionsMatchTrue SpecialValueMapOptionsMatch = "true"
)
SpecialValueMapOptionsMatchTrue SpecialValueMapOptionsMatch = "true"
// Defines values for SpecialValueMapType.
const (
SpecialValueMapTypeRange SpecialValueMapType = "range"
SpecialValueMapTypeRegex SpecialValueMapType = "regex"
SpecialValueMapTypeSpecial SpecialValueMapType = "special"
SpecialValueMapTypeValue SpecialValueMapType = "value"
)
// Defines values for SpecialValueMatch.
const (
SpecialValueMatchEmpty SpecialValueMatch = "empty"
SpecialValueMatchFalse SpecialValueMatch = "false"
SpecialValueMatchNan SpecialValueMatch = "nan"
SpecialValueMatchNull SpecialValueMatch = "null"
SpecialValueMatchEmpty SpecialValueMatch = "empty"
SpecialValueMatchFalse SpecialValueMatch = "false"
SpecialValueMatchNan SpecialValueMatch = "nan"
SpecialValueMatchNull SpecialValueMatch = "null"
SpecialValueMatchNullNan SpecialValueMatch = "null+nan"
SpecialValueMatchTrue SpecialValueMatch = "true"
SpecialValueMatchTrue SpecialValueMatch = "true"
)
// Defines values for ThresholdsMode.
const (
ThresholdsModeAbsolute ThresholdsMode = "absolute"
ThresholdsModeAbsolute ThresholdsMode = "absolute"
ThresholdsModePercentage ThresholdsMode = "percentage"
)
// Defines values for ValueMapType.
const (
ValueMapTypeRange ValueMapType = "range"
ValueMapTypeRegex ValueMapType = "regex"
ValueMapTypeSpecial ValueMapType = "special"
ValueMapTypeValue ValueMapType = "value"
)
// Defines values for VariableHide.
const (
VariableHideN0 VariableHide = 0
VariableHideN1 VariableHide = 1
VariableHideN2 VariableHide = 2
)
// Defines values for VariableType.
const (
VariableTypeAdhoc VariableType = "adhoc"
VariableTypeConstant VariableType = "constant"
VariableTypeCustom VariableType = "custom"
VariableTypeAdhoc VariableType = "adhoc"
VariableTypeConstant VariableType = "constant"
VariableTypeCustom VariableType = "custom"
VariableTypeDatasource VariableType = "datasource"
VariableTypeInterval VariableType = "interval"
VariableTypeQuery VariableType = "query"
VariableTypeSystem VariableType = "system"
VariableTypeTextbox VariableType = "textbox"
VariableTypeInterval VariableType = "interval"
VariableTypeQuery VariableType = "query"
VariableTypeSystem VariableType = "system"
VariableTypeTextbox VariableType = "textbox"
)
// TODO docs
@@ -202,7 +200,7 @@ type AnnotationTarget struct {
type Dashboard struct {
// TODO docs
Annotations *struct {
List *[]AnnotationQuery `json:"list,omitempty"`
List []AnnotationQuery `json:"list,omitempty"`
} `json:"annotations,omitempty"`
// Description of dashboard.
@@ -227,13 +225,13 @@ type Dashboard struct {
Id *int64 `json:"id,omitempty"`
// TODO docs
Links *[]Link `json:"links,omitempty"`
Links []Link `json:"links,omitempty"`
// When set to true, the dashboard will redraw panels at an interval matching the pixel width.
// This will keep data "moving left" regardless of the query refresh rate. This setting helps
// avoid dashboards presenting stale live data
LiveNow *bool `json:"liveNow,omitempty"`
Panels *[]interface{} `json:"panels,omitempty"`
LiveNow *bool `json:"liveNow,omitempty"`
Panels []interface{} `json:"panels,omitempty"`
// Refresh rate of dashboard. Represented via interval string, e.g. "5s", "1m", "1h", "1d".
Refresh *interface{} `json:"refresh,omitempty"`
@@ -255,11 +253,11 @@ type Dashboard struct {
Style Style `json:"style"`
// Tags associated with dashboard.
Tags *[]string `json:"tags,omitempty"`
Tags []string `json:"tags,omitempty"`
// TODO docs
Templating *struct {
List *[]VariableModel `json:"list,omitempty"`
List []VariableModel `json:"list,omitempty"`
} `json:"templating,omitempty"`
// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
@@ -366,7 +364,7 @@ type FieldColor struct {
FixedColor *string `json:"fixedColor,omitempty"`
// The main color scheme mode
Mode interface{} `json:"mode"`
Mode string `json:"mode"`
// TODO docs
SeriesBy *FieldColorSeriesByMode `json:"seriesBy,omitempty"`
@@ -385,7 +383,7 @@ type FieldConfig struct {
// custom is specified by the PanelFieldConfig field
// in panel plugin schemas.
Custom *map[string]interface{} `json:"custom,omitempty"`
Custom map[string]interface{} `json:"custom,omitempty"`
// Significant digits (for display)
Decimals *float32 `json:"decimals,omitempty"`
@@ -404,12 +402,12 @@ type FieldConfig struct {
Filterable *bool `json:"filterable,omitempty"`
// The behavior when clicking on a result
Links *[]interface{} `json:"links,omitempty"`
Links []interface{} `json:"links,omitempty"`
// Convert input values into a display string
Mappings *[]ValueMapping `json:"mappings,omitempty"`
Max *float32 `json:"max,omitempty"`
Min *float32 `json:"min,omitempty"`
Mappings []interface{} `json:"mappings,omitempty"`
Max *float32 `json:"max,omitempty"`
Min *float32 `json:"min,omitempty"`
// Alternative to empty string
NoValue *string `json:"noValue,omitempty"`
@@ -454,13 +452,13 @@ type GraphPanelType string
// GridPos defines model for GridPos.
type GridPos struct {
// Panel
// H Panel
H int `json:"h"`
// true if fixed
// Static true if fixed
Static *bool `json:"static,omitempty"`
// Panel
// W Panel
W int `json:"w"`
// Panel x
@@ -506,7 +504,7 @@ type Panel struct {
Uid *string `json:"uid,omitempty"`
} `json:"datasource,omitempty"`
// Description.
// Description Description.
Description *string `json:"description,omitempty"`
FieldConfig FieldConfigSource `json:"fieldConfig"`
GridPos *GridPos `json:"gridPos,omitempty"`
@@ -521,7 +519,7 @@ type Panel struct {
// Panel links.
// TODO fill this out - seems there are a couple variants?
Links *[]Link `json:"links,omitempty"`
Links []Link `json:"links,omitempty"`
// TODO docs
MaxDataPoints *float32 `json:"maxDataPoints,omitempty"`
@@ -545,20 +543,20 @@ type Panel struct {
RepeatPanelId *int64 `json:"repeatPanelId,omitempty"`
// TODO docs
Tags *[]string `json:"tags,omitempty"`
Tags []string `json:"tags,omitempty"`
// TODO docs
Targets *[]Target `json:"targets,omitempty"`
Targets []Target `json:"targets,omitempty"`
// TODO docs - seems to be an old field from old dashboard alerts?
Thresholds *[]interface{} `json:"thresholds,omitempty"`
Thresholds []interface{} `json:"thresholds,omitempty"`
// TODO docs
// TODO tighter constraint
TimeFrom *string `json:"timeFrom,omitempty"`
// TODO docs
TimeRegions *[]interface{} `json:"timeRegions,omitempty"`
TimeRegions []interface{} `json:"timeRegions,omitempty"`
// TODO docs
// TODO tighter constraint
@@ -583,20 +581,19 @@ type PanelRepeatDirection string
// TODO docs
type RangeMap struct {
Options struct {
// to and from are `number | null` in current ts, really not sure what to do
// From to and from are `number | null` in current ts, really not sure what to do
From float64 `json:"from"`
// TODO docs
Result ValueMappingResult `json:"result"`
To float64 `json:"to"`
} `json:"options"`
Type struct {
// Embedded struct due to allOf(#/components/schemas/MappingType)
MappingType `yaml:",inline"`
// Embedded fields due to inline allOf schema
} `json:"type"`
Type RangeMapType `json:"type"`
}
// RangeMapType defines model for RangeMap.Type.
type RangeMapType string
// TODO docs
type RegexMap struct {
Options struct {
@@ -605,13 +602,12 @@ type RegexMap struct {
// TODO docs
Result ValueMappingResult `json:"result"`
} `json:"options"`
Type struct {
// Embedded struct due to allOf(#/components/schemas/MappingType)
MappingType `yaml:",inline"`
// Embedded fields due to inline allOf schema
} `json:"type"`
Type RegexMapType `json:"type"`
}
// RegexMapType defines model for RegexMap.Type.
type RegexMapType string
// Row panel
type RowPanel struct {
Collapsed bool `json:"collapsed"`
@@ -679,16 +675,15 @@ type SpecialValueMap struct {
// TODO docs
Result ValueMappingResult `json:"result"`
} `json:"options"`
Type struct {
// Embedded struct due to allOf(#/components/schemas/MappingType)
MappingType `yaml:",inline"`
// Embedded fields due to inline allOf schema
} `json:"type"`
Type SpecialValueMapType `json:"type"`
}
// SpecialValueMapOptionsMatch defines model for SpecialValueMap.Options.Match.
type SpecialValueMapOptionsMatch string
// SpecialValueMapType defines model for SpecialValueMap.Type.
type SpecialValueMapType string
// TODO docs
type SpecialValueMatch string
@@ -699,7 +694,7 @@ type SpecialValueMatch string
// with types derived from plugins in the Instance variant.
// When working directly from CUE, importers can extend this
// type directly to achieve the same effect.
type Target map[string]interface{}
type Target = map[string]interface{}
// TODO docs
type Threshold struct {
@@ -730,15 +725,11 @@ type ThresholdsMode string
// TODO docs
type ValueMap struct {
Options map[string]ValueMappingResult `json:"options"`
Type struct {
// Embedded struct due to allOf(#/components/schemas/MappingType)
MappingType `yaml:",inline"`
// Embedded fields due to inline allOf schema
} `json:"type"`
Type ValueMapType `json:"type"`
}
// TODO docs
type ValueMapping interface{}
// ValueMapType defines model for ValueMap.Type.
type ValueMapType string
// TODO docs
type ValueMappingResult struct {
@@ -757,15 +748,15 @@ type VariableHide int
// TODO there appear to be a lot of different kinds of [template] vars here? if so need a disjunction
type VariableModel struct {
// Ref to a DataSource instance
Datasource *DataSourceRef `json:"datasource,omitempty"`
Description *string `json:"description,omitempty"`
Error *map[string]interface{} `json:"error,omitempty"`
Global bool `json:"global"`
Hide VariableHide `json:"hide"`
Id string `json:"id"`
Index int `json:"index"`
Label *string `json:"label,omitempty"`
Name string `json:"name"`
Datasource *DataSourceRef `json:"datasource,omitempty"`
Description *string `json:"description,omitempty"`
Error map[string]interface{} `json:"error,omitempty"`
Global bool `json:"global"`
Hide VariableHide `json:"hide"`
Id string `json:"id"`
Index int `json:"index"`
Label *string `json:"label,omitempty"`
Name string `json:"name"`
// TODO: Move this into a separated QueryVariableModel type
Query *interface{} `json:"query,omitempty"`

2
pkg/kinds/librarypanel/librarypanel_types_gen.go
View File

@@ -53,6 +53,6 @@ type LibraryPanel struct {
// Library element UID
Uid string `json:"uid"`
// panel version, incremented each time the dashboard is updated.
// Version panel version, incremented each time the dashboard is updated.
Version int64 `json:"version"`
}

6
pkg/kinds/playlist/playlist_types_gen.go
View File

@@ -12,10 +12,8 @@ package playlist
// Defines values for ItemType.
const (
ItemTypeDashboardById ItemType = "dashboard_by_id"
ItemTypeDashboardById ItemType = "dashboard_by_id"
ItemTypeDashboardByTag ItemType = "dashboard_by_tag"
ItemTypeDashboardByUid ItemType = "dashboard_by_uid"
)
@@ -27,7 +25,7 @@ type Playlist struct {
// The ordered list of items that the playlist will iterate over.
// FIXME! This should not be optional, but changing it makes the godegen awkward
Items *[]Item `json:"items,omitempty"`
Items []Item `json:"items,omitempty"`
// Name of the playlist.
Name string `json:"name"`

6
pkg/kinds/preferences/preferences_types_gen.go
View File

@@ -19,19 +19,19 @@ type Preferences struct {
Language *string `json:"language,omitempty"`
QueryHistory *QueryHistoryPreference `json:"queryHistory,omitempty"`
// light, dark, empty is default
// Theme light, dark, empty is default
Theme *string `json:"theme,omitempty"`
// The timezone selection
// TODO: this should use the timezone defined in common
Timezone *string `json:"timezone,omitempty"`
// day of the week (sunday, monday, etc)
// WeekStart day of the week (sunday, monday, etc)
WeekStart *string `json:"weekStart,omitempty"`
}
// QueryHistoryPreference defines model for QueryHistoryPreference.
type QueryHistoryPreference struct {
// one of: '' | 'query' | 'starred';
// HomeTab one of: '' | 'query' | 'starred';
HomeTab *string `json:"homeTab,omitempty"`
}

6
pkg/kinds/serviceaccount/serviceaccount_types_gen.go
View File

@@ -12,10 +12,8 @@ package serviceaccount
// Defines values for OrgRole.
const (
OrgRoleAdmin OrgRole = "Admin"
OrgRoleAdmin OrgRole = "Admin"
OrgRoleEditor OrgRole = "Editor"
OrgRoleViewer OrgRole = "Viewer"
)
@@ -53,7 +51,7 @@ type ServiceAccount struct {
Role OrgRole `json:"role"`
// Teams is a list of teams the service account belongs to.
Teams *[]string `json:"teams,omitempty"`
Teams []string `json:"teams,omitempty"`
// Tokens is the number of active tokens for the service account.
// Tokens are used to authenticate the service account against Grafana.

3
pkg/kinds/team/team_types_gen.go
View File

@@ -13,11 +13,8 @@ package team
// Defines values for Permission.
const (
PermissionN0 Permission = 0
PermissionN1 Permission = 1
PermissionN2 Permission = 2
PermissionN4 Permission = 4
)