This repository has been archived by the owner on Apr 19, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #144 from HubertStefanski/bump-amo-1.2.2
Bump Grafana-Operator to v3.5.0 & AMO to 1.3.0
- Loading branch information
Showing
13 changed files
with
700 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
336 changes: 336 additions & 0 deletions
336
...nitoring-operator/1.3.0/application-monitoring-operator.v1.3.0.clusterserviceversion.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
42 changes: 42 additions & 0 deletions
42
...ring-operator/1.3.0/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: applicationmonitorings.applicationmonitoring.integreatly.org | ||
| spec: | ||
| group: applicationmonitoring.integreatly.org | ||
| names: | ||
| kind: ApplicationMonitoring | ||
| listKind: ApplicationMonitoringList | ||
| plural: applicationmonitorings | ||
| singular: applicationmonitoring | ||
| scope: Namespaced | ||
| version: v1alpha1 | ||
| validation: | ||
| openAPIV3Schema: | ||
| required: ["spec"] | ||
| properties: | ||
| spec: | ||
| required: ["labelSelector"] | ||
| properties: | ||
| labelSelector: | ||
| type: string | ||
| minimum: 1 | ||
| description: The selector used by the Prometheus and Grafana Operators to discover resources | ||
| additionalScrapeConfigSecretName: | ||
| type: string | ||
| description: The name of the secret from which additional scrape configs will be passed to the prometheus operator | ||
| additionalScrapeConfigSecretKey: | ||
| type: string | ||
| description: The key under which additional scrape configs are stored within the secret | ||
| prometheusRetention: | ||
| type: string | ||
| description: Retention time for prometheus data. See https://prometheus.io/docs/prometheus/latest/storage/ | ||
| prometheusStorageRequest: | ||
| type: string | ||
| description: How much storage to assign to a volume claim for persisting Prometheus data. See https://github.com/coreos/prometheus-operator/blob/ca400fdc3edd0af0df896a338eca270e115b74d7/Documentation/api.md#storagespec | ||
| prometheusInstanceNamespaces: | ||
| type: string | ||
| description: The list of namespaces to watch for prometheus custom resources | ||
| alertmanagerInstanceNamespaces: | ||
| type: string | ||
| description: The list of namespaces to watch for alertmanager custom resources |
60 changes: 60 additions & 0 deletions
60
...-monitoring-operator/1.3.0/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: blackboxtargets.applicationmonitoring.integreatly.org | ||
| spec: | ||
| group: applicationmonitoring.integreatly.org | ||
| names: | ||
| kind: BlackboxTarget | ||
| listKind: BlackboxTargetList | ||
| plural: blackboxtargets | ||
| singular: blackboxtarget | ||
| scope: Namespaced | ||
| validation: | ||
| openAPIV3Schema: | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| properties: | ||
| blackboxTargets: | ||
| description: 'Defines an endpoint which can be probed using the Prometheus Blackbox exporter' | ||
| items: | ||
| properties: | ||
| module: | ||
| type: string | ||
| service: | ||
| type: string | ||
| url: | ||
| type: string | ||
| required: | ||
| - url | ||
| - service | ||
| - module | ||
| type: object | ||
| type: array | ||
| type: object | ||
| status: | ||
| properties: | ||
| phase: | ||
| description: 'The field phase is a status field indicating which phase the controller is with regards to reconciling blackbox target resources.' | ||
| format: int64 | ||
| type: integer | ||
| required: | ||
| - phase | ||
| type: object | ||
| version: v1alpha1 | ||
| versions: | ||
| - name: v1alpha1 | ||
| served: true | ||
| storage: true |
128 changes: 128 additions & 0 deletions
128
deploy/olm-catalog/application-monitoring-operator/1.3.0/grafana_crd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| apiVersion: apiextensions.k8s.io/v1beta1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: grafanas.integreatly.org | ||
| spec: | ||
| group: integreatly.org | ||
| names: | ||
| kind: Grafana | ||
| listKind: GrafanaList | ||
| plural: grafanas | ||
| singular: grafana | ||
| scope: Namespaced | ||
| subresources: | ||
| status: {} | ||
| version: v1alpha1 | ||
| validation: | ||
| openAPIV3Schema: | ||
| required: ["spec"] | ||
| properties: | ||
| spec: | ||
| properties: | ||
| containers: | ||
| type: array | ||
| items: | ||
| type: object | ||
| description: Additional container to add to the grafana pod | ||
| secrets: | ||
| type: array | ||
| items: | ||
| type: string | ||
| description: Secret to be mounted as volume into the grafana deployment | ||
| configMaps: | ||
| type: array | ||
| items: | ||
| type: string | ||
| description: Config map to be mounted as volume into the grafana deployment | ||
| logLevel: | ||
| type: string | ||
| description: Log level of the grafana instance, defaults to info | ||
| adminUser: | ||
| type: string | ||
| description: Default admin user name | ||
| adminPassword: | ||
| type: string | ||
| description: Default admin password | ||
| basicAuth: | ||
| type: boolean | ||
| description: Basic auth enabled | ||
| disableLoginForm: | ||
| type: boolean | ||
| description: Disable login form | ||
| disableSignoutMenu: | ||
| type: boolean | ||
| description: Disable signout menu | ||
| anonymous: | ||
| type: boolean | ||
| description: Anonymous auth enabled | ||
| config: | ||
| type: object | ||
| description: Grafana config | ||
| ingress: | ||
| type: object | ||
| properties: | ||
| enabled: | ||
| type: boolean | ||
| description: Create an ingress / route | ||
| path: | ||
| type: string | ||
| description: Ingress path | ||
| hostname: | ||
| type: string | ||
| description: The hostname of the ingress / route | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the ingress / route | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the ingress / route | ||
| targetPort: | ||
| type: string | ||
| description: Override port to target in the grafana service | ||
| service: | ||
| type: object | ||
| properties: | ||
| ports: | ||
| type: array | ||
| description: Override default ports | ||
| items: | ||
| type: object | ||
| descripton: A port to add to the grafana service | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the service | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the service | ||
| type: | ||
| type: string | ||
| description: Service type (NodePort, ClusterIP or LoadBalancer) | ||
| deployment: | ||
| type: object | ||
| properties: | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the service | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the service | ||
| serviceAccount: | ||
| type: object | ||
| properties: | ||
| annotations: | ||
| type: object | ||
| description: Additional annotations for the serviceaccount | ||
| labels: | ||
| type: object | ||
| description: Additional labels for the serviceaccount | ||
| client: | ||
| type: object | ||
| description: Grafana client settings | ||
| compat: | ||
| type: object | ||
| description: Backwards compatibility switches | ||
| dashboardLabelSelectors: | ||
| type: array | ||
| items: | ||
| type: object | ||
| description: Label selector or match expressions |
Oops, something went wrong.