mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
Code Activity

prometheus: Allow all selector for namespaces

Browse source
This commit is contained in:
Frederic Branczyk 2018-04-28 20:58:45 +01:00
parent 1ae66181a5
commit 7d023c2cb5
No known key found for this signature in database
GPG key ID: 7741A52782A90069
4 changed files with 5 additions and 5 deletions
Documentation
api.md
pkg
client/monitoring/v1
openapi_generated.gotypes.go
prometheus
operator.go

2
Documentation/api.md
View file

@ -197,7 +197,7 @@ Specification of the desired behavior of the Prometheus cluster. More info: http
| ----- | ----------- | ------ | -------- |
| podMetadata | Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata Metadata Labels and Annotations gets propagated to the prometheus pods. | *[metav1.ObjectMeta](https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6/#objectmeta-v1-meta) | false |
| serviceMonitorSelector | ServiceMonitors to be selected for target discovery. | *[metav1.LabelSelector](https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6/#labelselector-v1-meta) | false |
| serviceMonitorNamespaceSelector | Namespaces to be selected for ServiceMonitor discovery. If empty, only check own namespace. | *[metav1.LabelSelector](https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6/#labelselector-v1-meta) | false |
| serviceMonitorNamespaceSelector | Namespaces to be selected for ServiceMonitor discovery. If nil, only check own namespace. | *[metav1.LabelSelector](https://v1-6.docs.kubernetes.io/docs/api-reference/v1.6/#labelselector-v1-meta) | false |
| version | Version of Prometheus to be deployed. | string | false |
| paused | When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. | bool | false |
| baseImage | Base image to use for a Prometheus deployment. | string | false |

2
pkg/client/monitoring/v1/openapi_generated.go
View file

@ -678,7 +678,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"serviceMonitorNamespaceSelector": {
SchemaProps: spec.SchemaProps{
Description: "Namespaces to be selected for ServiceMonitor discovery. If empty, only check own namespace.",
Description: "Namespaces to be selected for ServiceMonitor discovery. If nil, only check own namespace.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"),
},
},

2
pkg/client/monitoring/v1/types.go
View file

@ -60,7 +60,7 @@ type PrometheusSpec struct {
PodMetadata *metav1.ObjectMeta `json:"podMetadata,omitempty"`
// ServiceMonitors to be selected for target discovery.
ServiceMonitorSelector *metav1.LabelSelector `json:"serviceMonitorSelector,omitempty"`
// Namespaces to be selected for ServiceMonitor discovery. If empty, only
// Namespaces to be selected for ServiceMonitor discovery. If nil, only
// check own namespace.
ServiceMonitorNamespaceSelector *metav1.LabelSelector `json:"serviceMonitorNamespaceSelector,omitempty"`
// Version of Prometheus to be deployed.

4
pkg/prometheus/operator.go
View file

@ -1076,8 +1076,8 @@ func (c *Operator) selectServiceMonitors(p *monitoringv1.Prometheus) (map[string
return nil, err
}
// If 'ServiceMonitorNamespaceSelector' is empty, only check own namespace.
if p.Spec.ServiceMonitorNamespaceSelector == nil || p.Spec.ServiceMonitorNamespaceSelector.Size() == 0 {
// If 'ServiceMonitorNamespaceSelector' is nil, only check own namespace.
if p.Spec.ServiceMonitorNamespaceSelector == nil {
namespaces = append(namespaces, p.Namespace)
} else {
servMonNSSelector, err := metav1.LabelSelectorAsSelector(p.Spec.ServiceMonitorNamespaceSelector)