Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • github-mirror/prometheus-operator/kube-prometheus
1 result
Show changes
Showing
with 57 additions and 27 deletions
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
rules: rules:
- apiGroups: - apiGroups:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: k8s name: k8s
namespace: monitoring namespace: monitoring
spec: spec:
...@@ -18,7 +18,7 @@ spec: ...@@ -18,7 +18,7 @@ spec:
port: web port: web
enableFeatures: [] enableFeatures: []
externalLabels: {} externalLabels: {}
image: quay.io/prometheus/prometheus:v3.2.0 image: quay.io/prometheus/prometheus:v3.2.1
nodeSelector: nodeSelector:
kubernetes.io/os: linux kubernetes.io/os: linux
podMetadata: podMetadata:
...@@ -27,7 +27,7 @@ spec: ...@@ -27,7 +27,7 @@ spec:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
podMonitorNamespaceSelector: {} podMonitorNamespaceSelector: {}
podMonitorSelector: {} podMonitorSelector: {}
probeNamespaceSelector: {} probeNamespaceSelector: {}
...@@ -47,4 +47,4 @@ spec: ...@@ -47,4 +47,4 @@ spec:
serviceAccountName: prometheus-k8s serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {} serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {} serviceMonitorSelector: {}
version: 3.2.0 version: 3.2.1
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
prometheus: k8s prometheus: k8s
role: alert-rules role: alert-rules
name: prometheus-k8s-prometheus-rules name: prometheus-k8s-prometheus-rules
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s-config name: prometheus-k8s-config
namespace: monitoring namespace: monitoring
roleRef: roleRef:
......
...@@ -8,7 +8,7 @@ items: ...@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: default namespace: default
roleRef: roleRef:
...@@ -27,7 +27,7 @@ items: ...@@ -27,7 +27,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: kube-system namespace: kube-system
roleRef: roleRef:
...@@ -46,7 +46,7 @@ items: ...@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
roleRef: roleRef:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s-config name: prometheus-k8s-config
namespace: monitoring namespace: monitoring
rules: rules:
......
...@@ -8,7 +8,7 @@ items: ...@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: default namespace: default
rules: rules:
...@@ -46,7 +46,7 @@ items: ...@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: kube-system namespace: kube-system
rules: rules:
...@@ -84,7 +84,7 @@ items: ...@@ -84,7 +84,7 @@ items:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
rules: rules:
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -7,6 +7,6 @@ metadata: ...@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 3.2.0 app.kubernetes.io/version: 3.2.1
name: prometheus-k8s name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: alertmanagerconfigs.monitoring.coreos.com name: alertmanagerconfigs.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: alertmanagers.monitoring.coreos.com name: alertmanagers.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
...@@ -5298,6 +5298,15 @@ spec: ...@@ -5298,6 +5298,15 @@ spec:
ServiceAccountName is the name of the ServiceAccount to use to run the ServiceAccountName is the name of the ServiceAccount to use to run the
Prometheus Pods. Prometheus Pods.
type: string type: string
serviceName:
description: |-
The name of the service name used by the underlying StatefulSet(s) as the governing service.
If defined, the Service must be created before the Alertmanager resource in the same namespace and it must define a selector that matches the pod labels.
If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alermanager resources.
When deploying multiple Alertmanager resources in the same namespace, it is recommended to specify a different value for each.
See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
minLength: 1
type: string
sha: sha:
description: |- description: |-
SHA of Alertmanager container image to be deployed. Defaults to the value of `version`. SHA of Alertmanager container image to be deployed. Defaults to the value of `version`.
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: podmonitors.monitoring.coreos.com name: podmonitors.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: probes.monitoring.coreos.com name: probes.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: prometheuses.monitoring.coreos.com name: prometheuses.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
...@@ -8615,6 +8615,27 @@ spec: ...@@ -8615,6 +8615,27 @@ spec:
sha: sha:
description: 'Deprecated: use ''spec.image'' instead. The image''s digest can be specified as part of the image name.' description: 'Deprecated: use ''spec.image'' instead. The image''s digest can be specified as part of the image name.'
type: string type: string
shardRetentionPolicy:
description: |-
ShardRetentionPolicy defines the retention policy for the Prometheus shards.
(Alpha) Using this field requires the 'PrometheusShardRetentionPolicy' feature gate to be enabled.
The final goals for this feature can be seen at https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/proposals/202310-shard-autoscaling.md#graceful-scale-down-of-prometheus-servers,
however, the feature is not yet fully implemented in this PR. The limitation being:
* Retention duration is not settable, for now, shards are retained forever.
properties:
whenScaled:
description: |-
Defines the retention policy when the Prometheus shards are scaled down.
* `Delete`, the operator will delete the pods from the scaled-down shard(s).
* `Retain`, the operator will keep the pods from the scaled-down shard(s), so the data can still be queried.
If not defined, the operator assumes the `Delete` value.
enum:
- Retain
- Delete
type: string
type: object
shards: shards:
description: |- description: |-
Number of shards to distribute the scraped targets onto. Number of shards to distribute the scraped targets onto.
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: prometheusagents.monitoring.coreos.com name: prometheusagents.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
......
...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition ...@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.17.2 controller-gen.kubebuilder.io/version: v0.17.2
operator.prometheus.io/version: 0.80.0 operator.prometheus.io/version: 0.80.1
name: prometheusrules.monitoring.coreos.com name: prometheusrules.monitoring.coreos.com
spec: spec:
group: monitoring.coreos.com group: monitoring.coreos.com
......