diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 917aa9c786504a3f59e043b8b5bfe20d8741ea2a..e0f0d2728856f9a011c4d419f794796aa583f0e1 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -6,7 +6,7 @@
"nodeExporter": "1.8.2",
"prometheus": "2.54.0",
"prometheusAdapter": "0.12.0",
- "prometheusOperator": "0.75.2",
+ "prometheusOperator": "0.76.0",
"kubeRbacProxy": "0.18.0",
"configmapReload": "0.13.1",
"pyrra": "0.6.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 8e36abf12c81dd95a5f9f2fbe69b3705ddac1be1..c162144c9b6043e2a5924fd3d0507ffa0db5a399 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "ad942b7118b0b2b640ea7bba2f1c45c39211f4c1",
+ "version": "f402c2ae2b32c450bbc2cb2a3610bcd1c0ece1b6",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -98,7 +98,7 @@
"subdir": "mixin-utils"
}
},
- "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+ "version": "4cafcbf97aefedc41816bd8e4f5ee41c9084062b",
"sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
},
{
@@ -128,8 +128,8 @@
"subdir": ""
}
},
- "version": "1b71e399caee334af8ba2d15d0dd615043a652d0",
- "sum": "qcRxavmCpuWQuwCMqYaOZ+soA8jxwWLrK7LYqohN5NA="
+ "version": "8c0479c02d05f479fafdcce56ad09ea7a264998a",
+ "sum": "QTVAYskSzcQW3fp2NqH4frV2nlYA93x7VMQ/4515zsU="
},
{
"source": {
@@ -138,7 +138,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "f8aa7d9bb9d8e29876e19f4859391a54a7e61d63",
+ "version": "276275904116ed9cd039e4e8e4087c11b72ab54e",
"sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
},
{
@@ -148,7 +148,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "f8aa7d9bb9d8e29876e19f4859391a54a7e61d63",
+ "version": "276275904116ed9cd039e4e8e4087c11b72ab54e",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -158,7 +158,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "a7a1ad63492f1de3b09b2c960c7159b16ce00e84",
+ "version": "d78591c744a12d8f4f402fb2616ac0e9b9b7b9e0",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -169,8 +169,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "a7a1ad63492f1de3b09b2c960c7159b16ce00e84",
- "sum": "EZR4sBAtmFRsUR7U4SybuBUhK9ncMCvEu9xHtu8B9KA="
+ "version": "d78591c744a12d8f4f402fb2616ac0e9b9b7b9e0",
+ "sum": "WBgMtfy0bK/ScTlL4e5agqGhGa0uYpn0mZcoNcT6QC4="
},
{
"source": {
@@ -179,7 +179,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "27b6eb7ce02680c84b9a06503edbddc9213f586d",
+ "version": "17afd4c0210386e57d6ea9e7968bd9049799a160",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -200,7 +200,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "5fd66ba8556053545fa1a1525aaaecfefb2c978a",
+ "version": "e86e4ed87ff771eae543af4eacf257251787ef5f",
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
"name": "prometheus"
},
@@ -222,7 +222,7 @@
"subdir": "mixin"
}
},
- "version": "c9500df77b93bf2d9d54d47022760c020e285dcf",
+ "version": "e62dbebe094422e82fcc1eea4a4ab54712891132",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index cb77e88e62f54602ffe4f9505b127cb9a9e1f398..cb2205dc19b5e3516eb173e1bdc9b120c6e9d8e7 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -1517,7 +1517,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -1563,7 +1563,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -1634,7 +1634,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1643,7 +1643,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1652,7 +1652,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "avg by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "avg by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1661,7 +1661,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "avg by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "avg by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1670,7 +1670,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1679,7 +1679,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1688,7 +1688,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -1697,7 +1697,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
}
@@ -1799,7 +1799,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "avg by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "avg by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -1845,7 +1845,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "avg by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "avg by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -1891,7 +1891,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -1937,7 +1937,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -1983,7 +1983,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -2029,7 +2029,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -2075,7 +2075,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -2121,7 +2121,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (namespace) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -2167,7 +2167,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (instance) (rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval]) / rate(node_netstat_Tcp_OutSegs{cluster=\"$cluster\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (instance) (\n rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval]) / rate(node_netstat_Tcp_OutSegs{cluster=\"$cluster\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -2213,7 +2213,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (instance) (rate(node_netstat_TcpExt_TCPSynRetrans{cluster=\"$cluster\"}[$__rate_interval]) / rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (instance) (\n rate(node_netstat_TcpExt_TCPSynRetrans{cluster=\"$cluster\"}[$__rate_interval]) / rate(node_netstat_Tcp_RetransSegs{cluster=\"$cluster\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -12727,7 +12727,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -12780,7 +12780,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -12851,7 +12851,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -12860,7 +12860,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -12869,7 +12869,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -12878,7 +12878,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -12887,7 +12887,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
},
@@ -12896,7 +12896,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"format": "table",
"instant": true
}
@@ -12990,7 +12990,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -13036,7 +13036,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -13082,7 +13082,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -13128,7 +13128,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -13174,7 +13174,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum by (namespace) (rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"})",
+ "expr": "sum by (pod) (\n rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace!=\"\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -13220,7 +13220,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval]) * on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}) by (pod)",
+ "expr": "sum by (pod) (\n rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=~\"$namespace\"}[$__rate_interval])\n * on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n)\n",
"legendFormat": "__auto"
}
],
@@ -13338,7 +13338,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13377,7 +13377,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13634,7 +13634,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13685,7 +13685,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13736,7 +13736,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(avg(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(avg(rate(container_network_receive_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13787,7 +13787,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(avg(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(avg(rate(container_network_transmit_bytes_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13838,7 +13838,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_receive_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13889,7 +13889,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_transmit_packets_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13940,7 +13940,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_receive_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
@@ -13991,7 +13991,7 @@ items:
"type": "prometheus",
"uid": "${datasource}"
},
- "expr": "sort_desc(sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) kube_pod_info{host_network=\"false\"}\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
+ "expr": "sort_desc(sum(rate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\",namespace=\"$namespace\"}[$__rate_interval])\n* on (cluster,namespace,pod) group_left ()\n topk by (cluster,namespace,pod) (\n 1,\n max by (cluster,namespace,pod) (kube_pod_info{host_network=\"false\"})\n )\n* on (cluster,namespace,pod)\ngroup_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\",namespace=\"$namespace\", workload=~\".+\", workload_type=~\"$type\"}) by (workload))\n",
"legendFormat": "__auto"
}
],
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 05a90f46441c7a401b18d1cecc64d7bfdf287811..644fed0bd02f90b54233aa844b2edba996cb8283 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index b291151df79c46427c527fc5f4fccfa537ab1cb5..c3705ba5d944ba29716810a219b85c5acc9627e5 100644
--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 16dc48af525adca7cb37c23ee86cdbaf7c70a7fd..1ecc22e006eb9d1672f510a03bd79a450cfa2807 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,17 +23,17 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.75.2
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.76.0
env:
- name: GOGC
value: "30"
- image: quay.io/prometheus-operator/prometheus-operator:v0.75.2
+ image: quay.io/prometheus-operator/prometheus-operator:v0.76.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 7ac8f2fb41caa578001168f293e92e4272c2b11a..514d085eca2d11fd510b17b19a67f43479963829 100644
--- a/manifests/prometheusOperator-networkPolicy.yaml
+++ b/manifests/prometheusOperator-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index 355d160d73ae69e7ac5f45b333f48d758522e358..c8c1e658d1c5edd72963ceb9724d922ad1924d35 100644
--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index 7f17358cb7019b0241cbbcafc3364eac73452475..cf61a882df27333b0aac99600b2dd84d98fb1edd 100644
--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index c84c3aee1d5354e1b7ebef06bfaab3f785bb1264..eb289d9366ba641bfbe92ce52bca262d40f08037 100644
--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index 151d644d8ee26c0728d9798aabef59eb45883582..5edb2cb4acc5cbdd822f385087ea7049af16f804 100644
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.75.2
+ app.kubernetes.io/version: 0.76.0
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 0ceb4788d0e4b92e428f8666f6e311c3379dc176..ae91070ef7cc77d1d6ce16ff50677bfb22216462 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -525,11 +525,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -1447,11 +1443,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -2182,11 +2174,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -2899,11 +2887,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -3644,11 +3628,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -4486,11 +4466,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -5160,11 +5136,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -5934,11 +5906,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -6632,11 +6600,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -7290,11 +7254,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -7937,11 +7897,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -8649,11 +8605,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 3802368e88f7ba82c0c6541a4f594b60552800c3..002fcf9d5cb473b63963951238168d8757676f8f 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1363,11 +1363,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index af6b9cbd22ad92b63aa6da37212c53f8b2db1c1a..7b99eadce41a071c2e7d416be92e867fd1cd9e41 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -565,11 +565,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 6d34cd0433852fcb1ab3c97b08ed85e9ff3e960e..c1d5744ecb7103c07d55f37dc71cce1f723bc5d5 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -452,11 +452,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 09e17d9a4b392ee432af81dd293063bded88f630..a63196b49e607bc4a9cdb11288b485ae362bf5b5 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -5308,6 +5308,20 @@ spec:
type: string
description: Defines on which Nodes the Pods are scheduled.
type: object
+ otlp:
+ description: |-
+ Settings related to the OTLP receiver feature.
+ It requires Prometheus >= v2.54.0.
+ properties:
+ promoteResourceAttributes:
+ description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
+ items:
+ minLength: 1
+ type: string
+ minItems: 1
+ type: array
+ x-kubernetes-list-type: set
+ type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -6013,11 +6027,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -6242,11 +6252,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
readRecent:
@@ -6860,11 +6866,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -7089,11 +7091,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
queueConfig:
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index be73b62e09b803b5e88c07acd55990f3f643b843..53069c56226d1f39d89eb37bd486df2ece664347 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -4581,6 +4581,20 @@ spec:
type: string
description: Defines on which Nodes the Pods are scheduled.
type: object
+ otlp:
+ description: |-
+ Settings related to the OTLP receiver feature.
+ It requires Prometheus >= v2.54.0.
+ properties:
+ promoteResourceAttributes:
+ description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
+ items:
+ minLength: 1
+ type: string
+ minItems: 1
+ type: array
+ x-kubernetes-list-type: set
+ type: object
overrideHonorLabels:
description: |-
When true, Prometheus resolves label conflicts by renaming the labels in the scraped data
@@ -5322,11 +5336,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -5551,11 +5561,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
queueConfig:
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 992f31422e121f51eda806a3ac5547ea8b572cf0..91c6d6f3d7be4a65e881df177171d470051ad2e7 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 096b71977ab06c2a5d5ae1d8f85308c8396c35a2..bbb8cbd41aef4bac40a734bd685b3e4cd5dd359c 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -313,11 +313,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -542,11 +538,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -1176,11 +1168,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -1408,11 +1396,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -1847,11 +1831,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -2079,11 +2059,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -2441,6 +2417,12 @@ spec:
hostNetworkingHost:
description: The host to use if the container is in host networking mode.
type: string
+ matchFirstNetwork:
+ description: |-
+ Configure whether to match the first network if the container has multiple networks defined.
+ If unset, Prometheus uses true by default.
+ It requires Prometheus >= v2.54.0.
+ type: boolean
noProxy:
description: |-
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
@@ -2595,11 +2577,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -2827,11 +2805,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -3297,11 +3271,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -3534,11 +3504,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -3727,6 +3693,10 @@ spec:
The private IP address is used by default, but may be changed to the public IP address with relabeling.
The IAM credentials used must have the ec2:DescribeInstances permission to discover scrape targets
See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#ec2_sd_config
+
+
+ The EC2 service discovery requires AWS API keys or role ARN for authentication.
+ BasicAuth, Authorization and OAuth2 fields are not present on purpose.
properties:
accessKey:
description: AccessKey is the AWS API key.
@@ -3752,12 +3722,18 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ enableHTTP2:
+ description: |-
+ Whether to enable HTTP2.
+ It requires Prometheus >= v2.41.0
+ type: boolean
filters:
description: |-
Filters can be used optionally to filter the instance list by other criteria.
Available filter criteria can be found here:
https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html
Filter API documentation: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Filter.html
+ It requires Prometheus >= v2.3.0
items:
description: Filter name and value pairs to limit the discovery process to a subset of available resources.
properties:
@@ -3778,20 +3754,86 @@ spec:
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
+ followRedirects:
+ description: |-
+ Configure whether HTTP requests follow HTTP 3xx redirects.
+ It requires Prometheus >= v2.41.0
+ type: boolean
+ noProxy:
+ description: |-
+ `noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
+ that should be excluded from proxying. IP and domain names can
+ contain port numbers.
+
+
+ It requires Prometheus >= v2.43.0.
+ type: string
port:
description: |-
The port to scrape metrics from. If using the public IP address, this must
instead be specified in the relabeling rule.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
+ proxyConnectHeader:
+ additionalProperties:
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
+ description: |-
+ ProxyConnectHeader optionally specifies headers to send to
+ proxies during CONNECT requests.
+
+
+ It requires Prometheus >= v2.43.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+ If unset, Prometheus uses its default value.
+
+
+ It requires Prometheus >= v2.43.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to use.'
+ pattern: ^http(s)?://.+$
+ type: string
refreshInterval:
description: RefreshInterval configures the refresh interval at which Prometheus will re-read the instance list.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
region:
- description: The AWS region
+ description: The AWS region.
+ minLength: 1
type: string
roleARN:
description: AWS Role ARN, an alternative to using AWS API keys.
+ minLength: 1
type: string
secretKey:
description: SecretKey is the AWS API secret.
@@ -3817,6 +3859,170 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ tlsConfig:
+ description: |-
+ TLS configuration to connect to the AWS EC2 API.
+ It requires Prometheus >= v2.41.0
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
type: object
type: array
enableCompression:
@@ -4091,11 +4297,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -4320,11 +4522,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -4845,11 +5043,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -5077,11 +5271,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -5424,11 +5614,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -5930,11 +6116,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -6159,11 +6341,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
role:
@@ -6650,11 +6828,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -6879,11 +7053,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -7372,11 +7542,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -7609,11 +7775,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -8020,11 +8182,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -8255,11 +8413,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
@@ -8685,11 +8839,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -9311,11 +9461,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
puppetDBSDConfigs:
@@ -9589,11 +9735,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
@@ -9824,11 +9966,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
query:
@@ -10202,11 +10340,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
refreshInterval:
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 96b22ae8c49c952770a5fee24ec41a0f85f9fce2..2ddac5a3c2ac2bb7b67761688ac4f8acba49a048 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -513,11 +513,7 @@ spec:
It requires Prometheus >= v2.43.0.
type: boolean
proxyUrl:
- description: |-
- `proxyURL` defines the HTTP proxy server to use.
-
-
- It requires Prometheus >= v2.43.0.
+ description: '`proxyURL` defines the HTTP proxy server to use.'
pattern: ^http(s)?://.+$
type: string
scopes:
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 5a5ab7890f271f293c92b79497e2cd666547a8a2..9bb43b23eb5312297ab389bcd65f42fd278ce2cb 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
- operator.prometheus.io/version: 0.75.2
+ operator.prometheus.io/version: 0.76.0
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com