diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 5b781c6230..9ee15674f7 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "83cf7bb4fc621f017fcaa9a735194fcec23420b8", + "version": "f7a36a55668d51f5046f38b8885446bcacee824d", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -78,7 +78,7 @@ "subdir": "grafana-builder" } }, - "version": "81276dc16831be896821b44b03a6405b4af8a8b4", + "version": "4baa491e9b2da98e131f55ab53638e237a5f9c7b", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -88,7 +88,7 @@ "subdir": "mixin-utils" } }, - "version": "81276dc16831be896821b44b03a6405b4af8a8b4", + "version": "4baa491e9b2da98e131f55ab53638e237a5f9c7b", "sum": "SRElwa/XrKAN8aZA9zvdRUx8iebl2It7KNQ7VFvMcBA=" }, { @@ -118,8 +118,8 @@ "subdir": "" } }, - "version": "af5e89820645ab7f99c8be0c247ab2f9f845869d", - "sum": "h+Ay46EcuMsXqx1DyzbVcAOc5C9T7gC9TIn5K5swc2E=" + "version": "9ceec88755d71e8cee9a47c91d7ed50faf4de493", + "sum": "7RWenSjnZLzHINp4rVqBug6utrAoaAeDcRkeHcXtv9o=" }, { "source": { @@ -148,7 +148,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "6e3ecb473accda9c5947f78d60e84e20adfc7829", + "version": "0775779242d5e3e837eb4f697fda2e9ba5074d71", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -159,8 +159,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "6e3ecb473accda9c5947f78d60e84e20adfc7829", - "sum": "ZZVen2GGS9xNZLODTtZSEJmgSmhfXeoU00M1ZqITN9o=" + "version": "0775779242d5e3e837eb4f697fda2e9ba5074d71", + "sum": "PAbGU2mH1jIH9MH9NGrMpecSWkvitcntijdMzsV0ZAM=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "3b06b97af4d146e141af92885a185891eb79a5b0", + "version": "d0eaa9fcd116fd2ef87390cd0f6966b2dfaee6f5", "sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=", "name": "alertmanager" }, @@ -180,7 +180,7 @@ "subdir": "docs/node-mixin" } }, - "version": "c46d1f23d06491408f51845862dfbbc73b51bd6e", + "version": "810510e12b063690e6e52700a867676b93492e92", "sum": "xYj6VYFT/eafsbleNlC+Z2VfLy1CndyYrJs9BcTmnX8=" }, { @@ -190,7 +190,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "9258e40589d971c0a009dccaa13462b87fb9454a", + "version": "2915b197730e6d0292fb9f4dded0e97150b19e9a", "sum": "CwaQpW66lHx+++sY2g4BgrUTEFZtlDnQzFjo0AlgfIg=", "name": "prometheus" }, diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml index f22bd94f41..df7f95ebb3 100644 --- a/manifests/kubernetesControlPlane-prometheusRule.yaml +++ b/manifests/kubernetesControlPlane-prometheusRule.yaml @@ -612,6 +612,8 @@ spec: summary: Node is not ready. expr: | kube_node_status_condition{job="kube-state-metrics",condition="Ready",status="true"} == 0 + and on (cluster, node) + kube_node_spec_unschedulable{job="kube-state-metrics"} == 0 for: 15m labels: severity: warning @@ -652,6 +654,8 @@ spec: summary: Node readiness status is flapping. expr: | sum(changes(kube_node_status_condition{job="kube-state-metrics",status="true",condition="Ready"}[15m])) by (cluster, node) > 2 + and on (cluster, node) + kube_node_spec_unschedulable{job="kube-state-metrics"} == 0 for: 15m labels: severity: warning diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index bbb6b5d079..f114f5bedf 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -7697,6 +7697,19 @@ spec: Only one scrape class can be set as the default. type: boolean + fallbackScrapeProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + It will only apply if the scrape resource doesn't specify any FallbackScrapeProtocol + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string metricRelabelings: description: |- MetricRelabelings configures the relabeling rules to apply to all samples before ingestion. diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml index acee16c945..79e1a3c9b7 100644 --- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml @@ -6090,6 +6090,19 @@ spec: Only one scrape class can be set as the default. type: boolean + fallbackScrapeProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + It will only apply if the scrape resource doesn't specify any FallbackScrapeProtocol + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string metricRelabelings: description: |- MetricRelabelings configures the relabeling rules to apply to all samples before ingestion.