Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Corrected Documentation for xxxMonitorNamespaceSelector #6605

Merged
merged 4 commits into from
May 20, 2024
Merged

Corrected Documentation for xxxMonitorNamespaceSelector #6605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0393bde
Corrected xxxMonitorNamespaxceSelector default value specification
AshwinSriram11 May 18, 2024
c49a2a3
Revert "Corrected xxxMonitorNamespaxceSelector default value specific…
AshwinSriram11 May 18, 2024
91a4eba
Correctd Documentation for xxxMonitorNamespaceSelector
AshwinSriram11 May 18, 2024
e531d96
Description for xxxMonitorNamespaceSelector edited
AshwinSriram11 May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Documentation/api.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bundle.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example/prometheus-operator-crd-full/monitoring.coreos.com_prometheusagents.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example/prometheus-operator-crd-full/monitoring.coreos.com_prometheuses.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions jsonnet/prometheus-operator/prometheusagents-crd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3827,7 +3827,7 @@
"type": "object"
},
"podMonitorNamespaceSelector": {
"description": "Namespaces to match for PodMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector matches the current\nnamespace only.",
"description": "Namespaces to match for PodMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector (default value) matches the current\nnamespace only.",
"properties": {
"matchExpressions": {
"description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
Expand Down Expand Up @@ -5261,7 +5261,7 @@
"type": "string"
},
"serviceMonitorNamespaceSelector": {
"description": "Namespaces to match for ServicedMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector matches the current\nnamespace only.",
"description": "Namespaces to match for ServicedMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector (default value) matches the current\nnamespace only.",
"properties": {
"matchExpressions": {
"description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
Expand Down
4 changes: 2 additions & 2 deletions jsonnet/prometheus-operator/prometheuses-crd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4403,7 +4403,7 @@
"type": "object"
},
"podMonitorNamespaceSelector": {
"description": "Namespaces to match for PodMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector matches the current\nnamespace only.",
"description": "Namespaces to match for PodMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector (default value) matches the current\nnamespace only.",
"properties": {
"matchExpressions": {
"description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
Expand Down Expand Up @@ -6409,7 +6409,7 @@
"type": "string"
},
"serviceMonitorNamespaceSelector": {
"description": "Namespaces to match for ServicedMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector matches the current\nnamespace only.",
"description": "Namespaces to match for ServicedMonitors discovery. An empty label selector\nmatches all namespaces. A null label selector (default value) matches the current\nnamespace only.",
"properties": {
"matchExpressions": {
"description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/monitoring/v1/prometheus_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ type CommonPrometheusFields struct {
// `spec.additionalScrapeConfigs` instead.
ServiceMonitorSelector *metav1.LabelSelector `json:"serviceMonitorSelector,omitempty"`
// Namespaces to match for ServicedMonitors discovery. An empty label selector
// matches all namespaces. A null label selector matches the current
// matches all namespaces. A null label selector (default value) matches the current
// namespace only.
ServiceMonitorNamespaceSelector *metav1.LabelSelector `json:"serviceMonitorNamespaceSelector,omitempty"`

Expand All @@ -137,7 +137,7 @@ type CommonPrometheusFields struct {
// `spec.additionalScrapeConfigs` instead.
PodMonitorSelector *metav1.LabelSelector `json:"podMonitorSelector,omitempty"`
// Namespaces to match for PodMonitors discovery. An empty label selector
// matches all namespaces. A null label selector matches the current
// matches all namespaces. A null label selector (default value) matches the current
// namespace only.
PodMonitorNamespaceSelector *metav1.LabelSelector `json:"podMonitorNamespaceSelector,omitempty"`

Expand Down