Skip to content

Commit

Permalink
order providers alphabetically
Browse files Browse the repository at this point in the history
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
  • Loading branch information
odubajDT committed Apr 2, 2024
1 parent e3fe05a commit 6c6c70d
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/.helm-tests/default/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13614,8 +13614,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13750,8 +13750,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2589,8 +2589,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/.helm-tests/metrics-only/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2589,8 +2589,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/.helm-tests/metrics-with-certs/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2604,8 +2604,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/assets/crd/examples/yaml-synopsis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: <data-source-instance-name>
namespace: <namespace>
spec:
type: prometheus | thanos | cortex | dynatrace | dql | datadog
type: cortex | datadog | dql | dynatrace | prometheus | thanos
targetServer: "<data-source-url>"
secretKeyRef:
name: <secret-name>
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/contribute/software/add-new-metric-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ The steps to create your own metrics provider are:
[line](https://github.com/keptn/lifecycle-toolkit/blob/main/metrics-operator/api/v1/keptnmetricsprovider_types.go#L29)
to look like this

`// +kubebuilder:validation:Pattern:=prometheus|thanos|cortex|dynatrace|datadog|dql|placeholder`.
`// +kubebuilder:validation:Pattern:=cortex|datadog|dql|dynatrace|prometheus|thanos|placeholder`.

In the metric-operator directory run `make generate manifests` to update the metrics-operator crd config
Then modify the helm chart and the helm chart crd validation to match the update in the metrics-operator crd config
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/reference/api-reference/metrics/v1/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ _Appears in:_

| Field | Description | Default | Optional |Validation |
| --- | --- | --- | --- | --- |
| `type` _string_ | Type represents the provider type. This can be one of prometheus, thanos, cortex, dynatrace, datadog, dql. || x | Optional: {} <br />Pattern: `prometheus|thanos|cortex|dynatrace|datadog|dql` <br /> |
| `type` _string_ | Type represents the provider type. This can be one of cortex, datadog, dql, dynatrace, prometheus or thanos. || x | Optional: {} <br />Pattern: `cortex|datadog|dql|dynatrace|prometheus|thanos` <br /> |
| `targetServer` _string_ | TargetServer defines URL (including port and protocol) at which the metrics provider is reachable. || x | |
| `secretKeyRef` _[SecretKeySelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#secretkeyselector-v1-core)_ | SecretKeyRef defines an optional secret for access credentials to the metrics provider. ||| Optional: {} <br /> |

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/reference/crd-reference/analysisvaluetemplate.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
namespace: <namespace-where-this-resource-resides>
spec:
provider:
name: prometheus | thanos | cortex | dynatrace | dql | datadog
name: cortex | datadog | dql | dynatrace | prometheus | thanos
query: <query>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/reference/crd-reference/evaluationdefinition.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ kind: KeptnEvaluationDefinition
metadata:
name: <evaluation-name>
spec:
source: prometheus | dynatrace | datadog
source: datadog | dynatrace | prometheus
objectives:
- name: query-1
query: "xxxx"
Expand Down
4 changes: 2 additions & 2 deletions metrics-operator/api/v1/keptnmetricsprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
// KeptnMetricsProviderSpec defines the desired state of KeptnMetricsProvider
type KeptnMetricsProviderSpec struct {
// +kubebuilder:validation:Optional
// +kubebuilder:validation:Pattern:=prometheus|thanos|cortex|dynatrace|datadog|dql
// Type represents the provider type. This can be one of prometheus, thanos, cortex, dynatrace, datadog, dql.
// +kubebuilder:validation:Pattern:=cortex|datadog|dql|dynatrace|prometheus|thanos
// Type represents the provider type. This can be one of cortex, datadog, dql, dynatrace, prometheus or thanos.
Type string `json:"type"`
// TargetServer defines URL (including port and protocol) at which the metrics provider is reachable.
TargetServer string `json:"targetServer"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ spec:
type: string
type:
description: Type represents the provider type. This can be one of
prometheus, thanos, cortex, dynatrace, datadog, dql.
pattern: prometheus|thanos|cortex|dynatrace|datadog|dql
cortex, datadog, dql, dynatrace, prometheus or thanos.
pattern: cortex|datadog|dql|dynatrace|prometheus|thanos
type: string
required:
- targetServer
Expand Down

0 comments on commit 6c6c70d

Please sign in to comment.