diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 0df0f590a65fe743d91e51070299c2ea20b56dee..daa3bb8f951cb77534cf53fad450ca093f2cd4d0 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -1,113 +1,123 @@
{
- "dependencies": [
- {
- "name": "kube-prometheus",
- "source": {
- "local": {
- "directory": "jsonnet/kube-prometheus"
- }
- },
- "version": ""
- },
- {
- "name": "ksonnet",
- "source": {
- "git": {
- "remote": "https://github.com/ksonnet/ksonnet-lib",
- "subdir": ""
- }
- },
- "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
- },
- {
- "name": "kubernetes-mixin",
- "source": {
- "git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
- "subdir": ""
- }
- },
- "version": "a08a6754d527eae13c553bd7565d5f4e9e9f3c0e"
- },
- {
- "name": "grafonnet",
- "source": {
- "git": {
- "remote": "https://github.com/grafana/grafonnet-lib",
- "subdir": "grafonnet"
- }
- },
- "version": "69bc267211790a1c3f4ea6e6211f3e8ffe22f987"
- },
- {
- "name": "grafana-builder",
- "source": {
- "git": {
- "remote": "https://github.com/kausalco/public",
- "subdir": "grafana-builder"
- }
- },
- "version": "e59d64a96a73e65ba53ba7fe05c9598974cc4a52"
- },
- {
- "name": "grafana",
- "source": {
- "git": {
- "remote": "https://github.com/brancz/kubernetes-grafana",
- "subdir": "grafana"
- }
- },
- "version": "539a90dbf63c812ad0194d8078dd776868a11c81"
- },
- {
- "name": "prometheus-operator",
- "source": {
- "git": {
- "remote": "https://github.com/coreos/prometheus-operator",
- "subdir": "jsonnet/prometheus-operator"
- }
- },
- "version": "908ee0372a9ac2c6574d589fdc56a4f3cb5f12d1"
- },
- {
- "name": "etcd-mixin",
- "source": {
- "git": {
- "remote": "https://github.com/coreos/etcd",
- "subdir": "Documentation/etcd-mixin"
- }
- },
- "version": "3ef2ad8e115449a7004b628a873e2629855ed468"
- },
- {
- "name": "prometheus",
- "source": {
- "git": {
- "remote": "https://github.com/prometheus/prometheus",
- "subdir": "documentation/prometheus-mixin"
- }
- },
- "version": "b05b5f9a300b0209689c06d70f676291f23774c4"
- },
- {
- "name": "node-mixin",
- "source": {
- "git": {
- "remote": "https://github.com/prometheus/node_exporter",
- "subdir": "docs/node-mixin"
- }
- },
- "version": "d574b4b41b72966a2ace4d6d81195081dfca8301"
- },
- {
- "name": "promgrafonnet",
- "source": {
- "git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
- "subdir": "lib/promgrafonnet"
- }
- },
- "version": "15ddfa20a6921ffbd43172eb54f6bdc1bcf8d3d3"
+ "dependencies": [
+ {
+ "name": "etcd-mixin",
+ "source": {
+ "git": {
+ "remote": "https://github.com/coreos/etcd",
+ "subdir": "Documentation/etcd-mixin"
}
- ]
+ },
+ "version": "fa972cf29666e821c44195c51df15b6e28ed29c4",
+ "sum": "bkp18AxkOUYnVC15Gh9EoIi+mMAn0IT3hMzb8mlzpSw="
+ },
+ {
+ "name": "grafana",
+ "source": {
+ "git": {
+ "remote": "https://github.com/brancz/kubernetes-grafana",
+ "subdir": "grafana"
+ }
+ },
+ "version": "539a90dbf63c812ad0194d8078dd776868a11c81",
+ "sum": "b8faWX1qqLGyN67sA36oRqYZ5HX+tHBRMPtrWRqIysE="
+ },
+ {
+ "name": "grafana-builder",
+ "source": {
+ "git": {
+ "remote": "https://github.com/grafana/jsonnet-libs",
+ "subdir": "grafana-builder"
+ }
+ },
+ "version": "1f273dd3c7a619bcd05c3e1c2650204104a273d8",
+ "sum": "ELsYwK+kGdzX1mee2Yy+/b2mdO4Y503BOCDkFzwmGbE="
+ },
+ {
+ "name": "grafonnet",
+ "source": {
+ "git": {
+ "remote": "https://github.com/grafana/grafonnet-lib",
+ "subdir": "grafonnet"
+ }
+ },
+ "version": "47db72da03fc4a7a0658a87791e13c3315a3a252",
+ "sum": "ssLOSIiYWYBvEYJHwRtwMY4kPQoP+MuIUkT0bp2Mb6A="
+ },
+ {
+ "name": "ksonnet",
+ "source": {
+ "git": {
+ "remote": "https://github.com/ksonnet/ksonnet-lib",
+ "subdir": ""
+ }
+ },
+ "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f",
+ "sum": "h28BXZ7+vczxYJ2sCt8JuR9+yznRtU/iA6DCpQUrtEg="
+ },
+ {
+ "name": "kube-prometheus",
+ "source": {
+ "local": {
+ "directory": "jsonnet/kube-prometheus"
+ }
+ },
+ "version": ""
+ },
+ {
+ "name": "kubernetes-mixin",
+ "source": {
+ "git": {
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
+ "subdir": ""
+ }
+ },
+ "version": "325f8a46fac9605f1de8bc20ca811cb92d1ef7e5",
+ "sum": "qfm0EpLrEZ1+fe93LFLa9tyOalK6JehpholxO2d0xXU="
+ },
+ {
+ "name": "node-mixin",
+ "source": {
+ "git": {
+ "remote": "https://github.com/prometheus/node_exporter",
+ "subdir": "docs/node-mixin"
+ }
+ },
+ "version": "5a7b85876d6108a91f0d8673c0d7eca38687671b",
+ "sum": "3N77msMjqClzQHbZOxn4GTlV+FZpU+y1gCekvCvxwy0="
+ },
+ {
+ "name": "prometheus",
+ "source": {
+ "git": {
+ "remote": "https://github.com/prometheus/prometheus",
+ "subdir": "documentation/prometheus-mixin"
+ }
+ },
+ "version": "74726367cf7a7e8d0332238defd2e7f4169030bd",
+ "sum": "wSDLAXS5Xzla9RFRE2IW5mRToeRFULHb7dSYYBDfEsM="
+ },
+ {
+ "name": "prometheus-operator",
+ "source": {
+ "git": {
+ "remote": "https://github.com/coreos/prometheus-operator",
+ "subdir": "jsonnet/prometheus-operator"
+ }
+ },
+ "version": "8d44e0990230144177f97cf62ae4f43b1c4e3168",
+ "sum": "5U7/8MD3pF9O0YDTtUhg4vctkUBRVFxZxWUyhtNiBM8="
+ },
+ {
+ "name": "promgrafonnet",
+ "source": {
+ "git": {
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
+ "subdir": "lib/promgrafonnet"
+ }
+ },
+ "version": "325f8a46fac9605f1de8bc20ca811cb92d1ef7e5",
+ "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
+ }
+ ]
}
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index a9c7baba7a667ef175de046f6701120b2a427472..9fcb6c5ca382cbe1efc1b158f87fb7eee604b04f 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -1753,7 +1753,6 @@ items:
}
],
"title": "Current Status",
- "transform": "table",
"type": "table"
},
{
@@ -2529,7 +2528,7 @@ items:
"schemaVersion": 18,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -4083,7 +4082,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "1 - sum(:node_memory_MemFreeCachedBuffers_bytes:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable_memory_bytes{cluster=\"$cluster\"})",
+ "expr": "1 - sum(:node_memory_MemAvailable_bytes:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable_memory_bytes{cluster=\"$cluster\"})",
"format": "time_series",
"instant": true,
"intervalFactor": 2,
@@ -5333,7 +5332,7 @@ items:
],
"targets": [
{
- "expr": "sum(irate(container_network_receive_bytes_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -5342,7 +5341,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_transmit_bytes_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -5351,7 +5350,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_receive_packets_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -5360,7 +5359,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_transmit_packets_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_transmit_packets_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -5369,7 +5368,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_receive_packets_dropped_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -5378,7 +5377,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_transmit_packets_dropped_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -5478,7 +5477,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_bytes_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -5576,7 +5575,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_transmit_bytes_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -5674,7 +5673,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "avg(irate(container_network_receive_bytes_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "avg(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -5772,7 +5771,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "avg(irate(container_network_transmit_bytes_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "avg(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -5870,7 +5869,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_packets_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -5968,7 +5967,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_packets_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -6066,7 +6065,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_packets_dropped_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -6164,7 +6163,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_transmit_packets_dropped_total{namespace=~\".+\"}[$interval])) by (namespace)",
+ "expr": "sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\".+\"}[$interval])) by (namespace)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{namespace}}",
@@ -7366,7 +7365,7 @@ items:
],
"targets": [
{
- "expr": "sum(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -7375,7 +7374,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -7384,7 +7383,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -7393,7 +7392,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_transmit_packets_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_transmit_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -7402,7 +7401,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_receive_packets_dropped_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -7411,7 +7410,7 @@ items:
"step": 10
},
{
- "expr": "sum(irate(container_network_transmit_packets_dropped_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -7511,7 +7510,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -7609,7 +7608,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -7707,7 +7706,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -7805,7 +7804,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -7903,7 +7902,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_receive_packets_dropped_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -8001,7 +8000,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(irate(container_network_transmit_packets_dropped_total{namespace=~\"$namespace\"}[$interval])) by (pod)",
+ "expr": "sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -8635,7 +8634,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", node=\"$node\", container!=\"\"}) by (pod)",
+ "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{cluster=\"$cluster\", node=\"$node\", container!=\"\"}) by (pod)",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -11709,7 +11708,7 @@ items:
],
"targets": [
{
- "expr": "(sum(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -11718,7 +11717,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -11727,7 +11726,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -11736,7 +11735,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_transmit_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -11745,7 +11744,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_receive_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -11754,7 +11753,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_transmit_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -11854,7 +11853,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -11952,7 +11951,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12050,7 +12049,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(avg(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(avg(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12148,7 +12147,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(avg(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(avg(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12246,7 +12245,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12344,7 +12343,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_transmit_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12442,7 +12441,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_receive_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12540,7 +12539,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_transmit_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod) \ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (pod))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod) \ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\"$workload\", workload_type=\"$type\"}) by (pod))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
@@ -12863,7 +12862,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}} - {{workload_type}}",
@@ -13128,7 +13127,7 @@ items:
],
"targets": [
{
- "expr": "count(mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}) by (workload, workload_type)",
+ "expr": "count(mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}) by (workload, workload_type)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13137,7 +13136,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13146,7 +13145,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n kube_pod_container_resource_requests_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n kube_pod_container_resource_requests_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13155,7 +13154,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13164,7 +13163,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n kube_pod_container_resource_limits_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n kube_pod_container_resource_limits_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13173,7 +13172,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits_cpu_cores{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13273,7 +13272,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}} - {{workload_type}}",
@@ -13538,7 +13537,7 @@ items:
],
"targets": [
{
- "expr": "count(mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}) by (workload, workload_type)",
+ "expr": "count(mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}) by (workload, workload_type)",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13547,7 +13546,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13556,7 +13555,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n kube_pod_container_resource_requests_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n kube_pod_container_resource_requests_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13565,7 +13564,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_requests_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13574,7 +13573,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n kube_pod_container_resource_limits_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n kube_pod_container_resource_limits_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13583,7 +13582,7 @@ items:
"step": 10
},
{
- "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\"}\n) by (workload, workload_type)\n",
+ "expr": "sum(\n container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", container!=\"\"}\n * on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n/sum(\n kube_pod_container_resource_limits_memory_bytes{cluster=\"$cluster\", namespace=\"$namespace\"}\n* on(namespace,pod)\n group_left(workload, workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=\"$namespace\", workload_type=\"$type\"}\n) by (workload, workload_type)\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13850,7 +13849,7 @@ items:
],
"targets": [
{
- "expr": "(sum(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload_type=\"$type\"}) by (workload))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13859,7 +13858,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload_type=\"$type\"}) by (workload))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13868,7 +13867,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload_type=\"$type\"}) by (workload))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13877,7 +13876,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_transmit_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload_type=\"$type\"}) by (workload))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13886,7 +13885,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_receive_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload_type=\"$type\"}) by (workload))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13895,7 +13894,7 @@ items:
"step": 10
},
{
- "expr": "(sum(irate(container_network_transmit_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload_type=\"$type\"}) by (workload))\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -13995,7 +13994,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14093,7 +14092,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14191,7 +14190,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(avg(irate(container_network_receive_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(avg(irate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14289,7 +14288,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(avg(irate(container_network_transmit_bytes_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(avg(irate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14387,7 +14386,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_receive_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_receive_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14485,7 +14484,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_transmit_packets_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14583,7 +14582,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_receive_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_receive_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod)\ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14681,7 +14680,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(sum(irate(container_network_transmit_packets_dropped_total{namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod) \ngroup_left(workload,workload_type) mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
+ "expr": "(sum(irate(container_network_transmit_packets_dropped_total{cluster=\"$cluster\", namespace=~\"$namespace\"}[$interval])\n* on (namespace,pod) \ngroup_left(workload,workload_type) mixin_pod_workload{cluster=\"$cluster\", namespace=~\"$namespace\", workload=~\".+\", workload_type=\"$type\"}) by (workload))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{workload}}",
@@ -14859,7 +14858,7 @@ items:
"text": "deployment",
"value": "deployment"
},
- "datasource": "prometheus",
+ "datasource": "$datasource",
"definition": "label_values(mixin_pod_workload{namespace=~\"$namespace\", workload=~\".+\"}, workload_type)",
"hide": 0,
"includeAll": false,
@@ -17971,7 +17970,6 @@ items:
}
],
"title": "Current Status",
- "transform": "table",
"type": "table"
},
{
@@ -18637,7 +18635,7 @@ items:
"schemaVersion": 18,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -19259,7 +19257,6 @@ items:
}
],
"title": "Current Status",
- "transform": "table",
"type": "table"
},
{
@@ -20035,7 +20032,7 @@ items:
"schemaVersion": 18,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -24644,7 +24641,7 @@ items:
"schemaVersion": 18,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
@@ -25500,6 +25497,12 @@ items:
data:
prometheus-remote-write.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
@@ -25509,14 +25512,15 @@ items:
"gnetId": null,
"graphTooltip": 0,
"hideControls": false,
+ "id": null,
"links": [
],
- "refresh": "10s",
+ "refresh": "",
"rows": [
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25527,12 +25531,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 1,
+ "gridPos": {
+
+ },
+ "id": 2,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -25542,11 +25551,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -25556,12 +25566,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} - ignoring(queue) group_right(instance) prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "(\n prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} \n- \n ignoring(queue) group_right(instance) prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}\n)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25587,11 +25596,11 @@ items:
},
"yaxes": [
{
- "format": "s",
+ "format": "short",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -25600,7 +25609,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -25613,12 +25622,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 2,
+ "gridPos": {
+
+ },
+ "id": 3,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -25628,11 +25642,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -25642,12 +25657,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) - ignoring (queue) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "(\n rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) \n- \n ignoring (queue) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25677,7 +25691,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -25686,7 +25700,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25696,11 +25710,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Timestamps",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25711,12 +25726,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 3,
+ "gridPos": {
+
+ },
+ "id": 4,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -25726,11 +25746,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -25740,12 +25761,11 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_samples_in_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])- ignoring(queue) group_right(instance) rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) - rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "rate(\n prometheus_remote_storage_samples_in_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n- \n ignoring(queue) group_right(instance) rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) \n- \n rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25775,7 +25795,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -25784,7 +25804,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -25794,11 +25814,12 @@ items:
"repeatRowId": null,
"showTitle": true,
"title": "Samples",
- "titleSize": "h6"
+ "titleSize": "h6",
+ "type": "row"
},
{
"collapse": false,
- "height": "250px",
+ "collapsed": false,
"panels": [
{
"aliasColors": {
@@ -25809,12 +25830,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 4,
+ "gridPos": {
+
+ },
+ "id": 5,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -25824,26 +25850,51 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "minSpan": 6,
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": "queue",
"seriesOverrides": [
-
+ {
+ "alias": "/max_shards/",
+ "yaxis": 2
+ }
],
"spaceLength": 10,
- "span": 6,
+ "span": 12,
"stack": false,
"steppedLine": false,
"targets": [
+ {
+ "expr": "prometheus_remote_storage_shards_max{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "max_shards:{{queue}}",
+ "refId": "A"
+ },
+ {
+ "expr": "prometheus_remote_storage_shards_min{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "min_shards:{{queue}}",
+ "refId": "B"
+ },
+ {
+ "expr": "prometheus_remote_storage_shards_desired{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "desired_shards:{{queue}}",
+ "refId": "C"
+ },
{
"expr": "prometheus_remote_storage_shards{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "legendFormat": "current_shards:{{queue}}",
+ "refId": "D"
}
],
"thresholds": [
@@ -25851,7 +25902,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Num. Shards",
+ "title": "Shards: $queue",
"tooltip": {
"shared": true,
"sort": 0,
@@ -25873,7 +25924,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -25882,10 +25933,23 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
- },
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "Shards",
+ "titleSize": "h6",
+ "type": "row"
+ },
+ {
+ "collapse": false,
+ "collapsed": false,
+ "panels": [
{
"aliasColors": {
@@ -25895,12 +25959,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 5,
+ "gridPos": {
+
+ },
+ "id": 6,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -25910,11 +25979,12 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": "queue",
"seriesOverrides": [
],
@@ -25928,8 +25998,7 @@ items:
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -25937,7 +26006,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Capacity",
+ "title": "Shard Capacity: $queue",
"tooltip": {
"shared": true,
"sort": 0,
@@ -25959,7 +26028,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -25968,22 +26037,10 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
- }
- ],
- "repeat": null,
- "repeatIteration": null,
- "repeatRowId": null,
- "showTitle": true,
- "title": "Shards",
- "titleSize": "h6"
- },
- {
- "collapse": false,
- "height": "250px",
- "panels": [
+ },
{
"aliasColors": {
@@ -25993,12 +26050,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 6,
+ "gridPos": {
+
+ },
+ "id": 7,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -26008,26 +26070,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": "queue",
"seriesOverrides": [
],
"spaceLength": 10,
- "span": 3,
+ "span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "prometheus_remote_storage_pending_samples{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -26035,7 +26097,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Dropped Samples",
+ "title": "Pending Samples: $queue",
"tooltip": {
"shared": true,
"sort": 0,
@@ -26057,7 +26119,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -26066,10 +26128,23 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
- },
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "Shard Details",
+ "titleSize": "h6",
+ "type": "row"
+ },
+ {
+ "collapse": false,
+ "collapsed": false,
+ "panels": [
{
"aliasColors": {
@@ -26079,12 +26154,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 7,
+ "gridPos": {
+
+ },
+ "id": 8,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -26094,26 +26174,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
- "span": 3,
+ "span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_failed_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "prometheus_tsdb_wal_segment_current{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
- "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "legendFormat": "{{cluster}}:{{instance}}",
+ "refId": "A"
}
],
"thresholds": [
@@ -26121,7 +26201,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Failed Samples",
+ "title": "TSDB Current Segment",
"tooltip": {
"shared": true,
"sort": 0,
@@ -26139,11 +26219,11 @@ items:
},
"yaxes": [
{
- "format": "short",
+ "format": "none",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -26152,7 +26232,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
},
@@ -26165,12 +26245,17 @@ items:
"dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 8,
+ "gridPos": {
+
+ },
+ "id": 9,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -26180,26 +26265,26 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
"spaceLength": 10,
- "span": 3,
+ "span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_retried_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "prometheus_wal_watcher_current_segment{cluster=~\"$cluster\", instance=~\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -26207,7 +26292,7 @@ items:
],
"timeFrom": null,
"timeShift": null,
- "title": "Retried Samples",
+ "title": "Remote Write Current Segment",
"tooltip": {
"shared": true,
"sort": 0,
@@ -26225,11 +26310,11 @@ items:
},
"yaxes": [
{
- "format": "short",
+ "format": "none",
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -26238,25 +26323,43 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
- },
- {
- "aliasColors": {
-
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
+ }
+ ],
+ "repeat": null,
+ "repeatIteration": null,
+ "repeatRowId": null,
+ "showTitle": true,
+ "title": "Segments",
+ "titleSize": "h6",
+ "type": "row"
+ },
+ {
+ "collapse": false,
+ "collapsed": false,
+ "panels": [
+ {
+ "aliasColors": {
+
+ },
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
"datasource": "$datasource",
"fill": 1,
- "id": 9,
+ "gridPos": {
+
+ },
+ "id": 10,
"legend": {
+ "alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
+ "rightSide": false,
"show": true,
"total": false,
"values": false
@@ -26266,11 +26369,285 @@ items:
"links": [
],
- "nullPointMode": "null as zero",
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": null,
+ "seriesOverrides": [
+
+ ],
+ "spaceLength": 10,
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Dropped Samples",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": [
+
+ ]
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "aliasColors": {
+
+ },
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "$datasource",
+ "fill": 1,
+ "gridPos": {
+
+ },
+ "id": 11,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [
+
+ ],
+ "nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
+ "repeat": null,
+ "seriesOverrides": [
+
+ ],
+ "spaceLength": 10,
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "rate(prometheus_remote_storage_failed_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Failed Samples",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": [
+
+ ]
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "aliasColors": {
+
+ },
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "$datasource",
+ "fill": 1,
+ "gridPos": {
+
+ },
+ "id": 12,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [
+
+ ],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": null,
+ "seriesOverrides": [
+
+ ],
+ "spaceLength": 10,
+ "span": 3,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "expr": "rate(prometheus_remote_storage_retried_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "format": "time_series",
+ "intervalFactor": 2,
+ "legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
+ "refId": "A"
+ }
+ ],
+ "thresholds": [
+
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Retried Samples",
+ "tooltip": {
+ "shared": true,
+ "sort": 0,
+ "value_type": "individual"
+ },
+ "type": "graph",
+ "xaxis": {
+ "buckets": null,
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": [
+
+ ]
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "aliasColors": {
+
+ },
+ "bars": false,
+ "dashLength": 10,
+ "dashes": false,
+ "datasource": "$datasource",
+ "fill": 1,
+ "gridPos": {
+
+ },
+ "id": 13,
+ "legend": {
+ "alignAsTable": false,
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "rightSide": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 1,
+ "links": [
+
+ ],
+ "nullPointMode": "null",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "repeat": null,
"seriesOverrides": [
],
@@ -26284,8 +26661,7 @@ items:
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}}-{{queue}}",
- "legendLink": null,
- "step": 10
+ "refId": "A"
}
],
"thresholds": [
@@ -26315,7 +26691,7 @@ items:
"label": null,
"logBase": 1,
"max": null,
- "min": 0,
+ "min": null,
"show": true
},
{
@@ -26324,7 +26700,7 @@ items:
"logBase": 1,
"max": null,
"min": null,
- "show": false
+ "show": true
}
]
}
@@ -26333,8 +26709,9 @@ items:
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
- "title": "Misc Rates.",
- "titleSize": "h6"
+ "title": "Misc. Rates",
+ "titleSize": "h6",
+ "type": "row"
}
],
"schemaVersion": 14,
@@ -26345,10 +26722,6 @@ items:
"templating": {
"list": [
{
- "current": {
- "text": "Prometheus",
- "value": "Prometheus"
- },
"hide": 0,
"label": null,
"name": "datasource",
@@ -26363,23 +26736,30 @@ items:
{
"allValue": null,
"current": {
- "selected": true,
- "text": "All",
- "value": "$__all"
+ "text": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ },
+ "value": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ }
},
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
- "label": "instance",
- "multi": true,
+ "label": null,
+ "multi": false,
"name": "instance",
"options": [
],
"query": "label_values(prometheus_build_info, instance)",
- "refresh": 1,
+ "refresh": 2,
"regex": "",
- "sort": 2,
+ "sort": 0,
"tagValuesQuery": "",
"tags": [
@@ -26391,23 +26771,65 @@ items:
{
"allValue": null,
"current": {
- "selected": true,
- "text": "All",
- "value": "$__all"
+ "text": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ },
+ "value": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ }
},
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
- "label": "cluster",
- "multi": true,
+ "label": null,
+ "multi": false,
"name": "cluster",
"options": [
],
"query": "label_values(kube_pod_container_info{image=~\".*prometheus.*\"}, cluster)",
- "refresh": 1,
+ "refresh": 2,
"regex": "",
- "sort": 2,
+ "sort": 0,
+ "tagValuesQuery": "",
+ "tags": [
+
+ ],
+ "tagsQuery": "",
+ "type": "query",
+ "useTags": false
+ },
+ {
+ "allValue": null,
+ "current": {
+ "text": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ },
+ "value": {
+ "selected": true,
+ "text": "All",
+ "value": "$__all"
+ }
+ },
+ "datasource": "$datasource",
+ "hide": 0,
+ "includeAll": true,
+ "label": null,
+ "multi": false,
+ "name": "queue",
+ "options": [
+
+ ],
+ "query": "label_values(prometheus_remote_storage_shards, queue)",
+ "refresh": 2,
+ "regex": "",
+ "sort": 0,
"tagValuesQuery": "",
"tags": [
@@ -26419,7 +26841,7 @@ items:
]
},
"time": {
- "from": "now-1h",
+ "from": "now-6h",
"to": "now"
},
"timepicker": {
@@ -26447,9 +26869,8 @@ items:
"30d"
]
},
- "timezone": "utc",
+ "timezone": "browser",
"title": "Prometheus Remote Write",
- "uid": "",
"version": 0
}
kind: ConfigMap
@@ -31725,7 +32146,7 @@ items:
"schemaVersion": 18,
"style": "dark",
"tags": [
-
+ "kubernetes-mixin"
],
"templating": {
"list": [
diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml
index 828c9c6a3c6583e9b16aae3e4fdbfe3302d219e2..be1642054971f9941d8b04b889c5d3c4be77c8e1 100644
--- a/manifests/prometheus-operator-serviceMonitor.yaml
+++ b/manifests/prometheus-operator-serviceMonitor.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -15,4 +15,4 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 1bb7a4294f81a5f35584a0d225147d71d4288b9a..93334a9e3c1641a88804f66fcb4b4766c33eeffb 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -65,6 +65,23 @@ spec:
rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[1m])
)
record: instance:node_network_transmit_drop_excluding_lo:rate1m
+ - name: kube-apiserver.rules
+ rules:
+ - expr: |
+ histogram_quantile(0.99, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver"}[5m])) without(instance, pod))
+ labels:
+ quantile: "0.99"
+ record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile
+ - expr: |
+ histogram_quantile(0.9, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver"}[5m])) without(instance, pod))
+ labels:
+ quantile: "0.9"
+ record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile
+ - expr: |
+ histogram_quantile(0.5, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver"}[5m])) without(instance, pod))
+ labels:
+ quantile: "0.5"
+ record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile
- name: k8s.rules
rules:
- expr: |
@@ -96,14 +113,14 @@ spec:
record: namespace:container_memory_usage_bytes:sum
- expr: |
sum by (namespace, label_name) (
- sum(kube_pod_container_resource_requests_memory_bytes{job="kube-state-metrics"} * on (endpoint, instance, job, namespace, pod, service) group_left(phase) (kube_pod_status_phase{phase=~"^(Pending|Running)$"} == 1)) by (namespace, pod)
+ sum(kube_pod_container_resource_requests_memory_bytes{job="kube-state-metrics"} * on (endpoint, instance, job, namespace, pod, service) group_left(phase) (kube_pod_status_phase{phase=~"Pending|Running"} == 1)) by (namespace, pod)
* on (namespace, pod)
group_left(label_name) kube_pod_labels{job="kube-state-metrics"}
)
record: namespace:kube_pod_container_resource_requests_memory_bytes:sum
- expr: |
sum by (namespace, label_name) (
- sum(kube_pod_container_resource_requests_cpu_cores{job="kube-state-metrics"} * on (endpoint, instance, job, namespace, pod, service) group_left(phase) (kube_pod_status_phase{phase=~"^(Pending|Running)$"} == 1)) by (namespace, pod)
+ sum(kube_pod_container_resource_requests_cpu_cores{job="kube-state-metrics"} * on (endpoint, instance, job, namespace, pod, service) group_left(phase) (kube_pod_status_phase{phase=~"Pending|Running"} == 1)) by (namespace, pod)
* on (namespace, pod)
group_left(label_name) kube_pod_labels{job="kube-state-metrics"}
)
@@ -188,23 +205,6 @@ spec:
labels:
quantile: "0.5"
record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile
- - name: kube-apiserver.rules
- rules:
- - expr: |
- histogram_quantile(0.99, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver"}[5m])) without(instance, pod))
- labels:
- quantile: "0.99"
- record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile
- - expr: |
- histogram_quantile(0.9, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver"}[5m])) without(instance, pod))
- labels:
- quantile: "0.9"
- record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile
- - expr: |
- histogram_quantile(0.5, sum(rate(apiserver_request_duration_seconds_bucket{job="apiserver"}[5m])) without(instance, pod))
- labels:
- quantile: "0.5"
- record: cluster_quantile:apiserver_request_duration_seconds:histogram_quantile
- name: node.rules
rules:
- expr: sum(min(kube_pod_info) by (node))
@@ -220,8 +220,16 @@ spec:
))
record: node:node_num_cpu:sum
- expr: |
- sum(node_memory_MemFree_bytes{job="node-exporter"} + node_memory_Cached_bytes{job="node-exporter"} + node_memory_Buffers_bytes{job="node-exporter"})
- record: :node_memory_MemFreeCachedBuffers_bytes:sum
+ sum(
+ node_memory_MemAvailable_bytes{job="node-exporter"} or
+ (
+ node_memory_Buffers_bytes{job="node-exporter"} +
+ node_memory_Cached_bytes{job="node-exporter"} +
+ node_memory_MemFree_bytes{job="node-exporter"} +
+ node_memory_Slab_bytes{job="node-exporter"}
+ )
+ )
+ record: :node_memory_MemAvailable_bytes:sum
- name: kube-prometheus-node-recording.rules
rules:
- expr: sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[3m])) BY
@@ -399,98 +407,6 @@ spec:
for: 1h
labels:
severity: warning
- - name: kubernetes-absent
- rules:
- - alert: AlertmanagerDown
- annotations:
- message: Alertmanager has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-alertmanagerdown
- expr: |
- absent(up{job="alertmanager-main",namespace="monitoring"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: CoreDNSDown
- annotations:
- message: CoreDNS has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-corednsdown
- expr: |
- absent(up{job="kube-dns"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: KubeAPIDown
- annotations:
- message: KubeAPI has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapidown
- expr: |
- absent(up{job="apiserver"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: KubeControllerManagerDown
- annotations:
- message: KubeControllerManager has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecontrollermanagerdown
- expr: |
- absent(up{job="kube-controller-manager"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: KubeSchedulerDown
- annotations:
- message: KubeScheduler has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeschedulerdown
- expr: |
- absent(up{job="kube-scheduler"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: KubeStateMetricsDown
- annotations:
- message: KubeStateMetrics has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubestatemetricsdown
- expr: |
- absent(up{job="kube-state-metrics"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: KubeletDown
- annotations:
- message: Kubelet has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeletdown
- expr: |
- absent(up{job="kubelet"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: NodeExporterDown
- annotations:
- message: NodeExporter has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-nodeexporterdown
- expr: |
- absent(up{job="node-exporter"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: PrometheusDown
- annotations:
- message: Prometheus has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-prometheusdown
- expr: |
- absent(up{job="prometheus-k8s",namespace="monitoring"} == 1)
- for: 15m
- labels:
- severity: critical
- - alert: PrometheusOperatorDown
- annotations:
- message: PrometheusOperator has disappeared from Prometheus target discovery.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-prometheusoperatordown
- expr: |
- absent(up{job="prometheus-operator",namespace="monitoring"} == 1)
- for: 15m
- labels:
- severity: critical
- name: kubernetes-apps
rules:
- alert: KubePodCrashLooping
@@ -795,7 +711,7 @@ spec:
) < 0.15
and
predict_linear(kubelet_volume_stats_available_bytes{job="kubelet"}[6h], 4 * 24 * 3600) < 0
- for: 5m
+ for: 1h
labels:
severity: critical
- alert: KubePersistentVolumeErrors
@@ -810,23 +726,6 @@ spec:
severity: critical
- name: kubernetes-system
rules:
- - alert: KubeNodeNotReady
- annotations:
- message: '{{ $labels.node }} has been unready for more than 15 minutes.'
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubenodenotready
- expr: |
- kube_node_status_condition{job="kube-state-metrics",condition="Ready",status="true"} == 0
- for: 15m
- labels:
- severity: warning
- - alert: KubeNodeUnreachable
- annotations:
- message: '{{ $labels.node }} is unreachable and some workloads may be rescheduled.'
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubenodeunreachable
- expr: |
- kube_node_spec_taint{job="kube-state-metrics",key="node.kubernetes.io/unreachable",effect="NoSchedule"} == 1
- labels:
- severity: warning
- alert: KubeVersionMismatch
annotations:
message: There are {{ $value }} different semantic versions of Kubernetes
@@ -850,23 +749,15 @@ spec:
for: 15m
labels:
severity: warning
- - alert: KubeletTooManyPods
- annotations:
- message: Kubelet '{{ $labels.node }}' is running at {{ $value | humanizePercentage
- }} of its Pod capacity.
- runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubelettoomanypods
- expr: |
- max(max(kubelet_running_pod_count{job="kubelet"}) by(instance) * on(instance) group_left(node) kubelet_node_name{job="kubelet"}) by(node) / max(kube_node_status_capacity_pods{job="kube-state-metrics"}) by(node) > 0.95
- for: 15m
- labels:
- severity: warning
+ - name: kubernetes-system-apiserver
+ rules:
- alert: KubeAPILatencyHigh
annotations:
message: The API server has a 99th percentile latency of {{ $value }} seconds
for {{ $labels.verb }} {{ $labels.resource }}.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapilatencyhigh
expr: |
- cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="apiserver",quantile="0.99",subresource!="log",verb!~"^(?:LIST|WATCH|WATCHLIST|PROXY|CONNECT)$"} > 1
+ cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="apiserver",quantile="0.99",subresource!="log",verb!~"LIST|WATCH|WATCHLIST|PROXY|CONNECT"} > 1
for: 10m
labels:
severity: warning
@@ -876,7 +767,7 @@ spec:
for {{ $labels.verb }} {{ $labels.resource }}.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapilatencyhigh
expr: |
- cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="apiserver",quantile="0.99",subresource!="log",verb!~"^(?:LIST|WATCH|WATCHLIST|PROXY|CONNECT)$"} > 4
+ cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="apiserver",quantile="0.99",subresource!="log",verb!~"LIST|WATCH|WATCHLIST|PROXY|CONNECT"} > 4
for: 10m
labels:
severity: critical
@@ -886,7 +777,7 @@ spec:
}} of requests.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapierrorshigh
expr: |
- sum(rate(apiserver_request_total{job="apiserver",code=~"^(?:5..)$"}[5m]))
+ sum(rate(apiserver_request_total{job="apiserver",code=~"5.."}[5m]))
/
sum(rate(apiserver_request_total{job="apiserver"}[5m])) > 0.03
for: 10m
@@ -898,7 +789,7 @@ spec:
}} of requests.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapierrorshigh
expr: |
- sum(rate(apiserver_request_total{job="apiserver",code=~"^(?:5..)$"}[5m]))
+ sum(rate(apiserver_request_total{job="apiserver",code=~"5.."}[5m]))
/
sum(rate(apiserver_request_total{job="apiserver"}[5m])) > 0.01
for: 10m
@@ -911,7 +802,7 @@ spec:
}}.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapierrorshigh
expr: |
- sum(rate(apiserver_request_total{job="apiserver",code=~"^(?:5..)$"}[5m])) by (resource,subresource,verb)
+ sum(rate(apiserver_request_total{job="apiserver",code=~"5.."}[5m])) by (resource,subresource,verb)
/
sum(rate(apiserver_request_total{job="apiserver"}[5m])) by (resource,subresource,verb) > 0.10
for: 10m
@@ -924,7 +815,7 @@ spec:
}}.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapierrorshigh
expr: |
- sum(rate(apiserver_request_total{job="apiserver",code=~"^(?:5..)$"}[5m])) by (resource,subresource,verb)
+ sum(rate(apiserver_request_total{job="apiserver",code=~"5.."}[5m])) by (resource,subresource,verb)
/
sum(rate(apiserver_request_total{job="apiserver"}[5m])) by (resource,subresource,verb) > 0.05
for: 10m
@@ -948,6 +839,75 @@ spec:
apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400
labels:
severity: critical
+ - alert: KubeAPIDown
+ annotations:
+ message: KubeAPI has disappeared from Prometheus target discovery.
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapidown
+ expr: |
+ absent(up{job="apiserver"} == 1)
+ for: 15m
+ labels:
+ severity: critical
+ - name: kubernetes-system-kubelet
+ rules:
+ - alert: KubeNodeNotReady
+ annotations:
+ message: '{{ $labels.node }} has been unready for more than 15 minutes.'
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubenodenotready
+ expr: |
+ kube_node_status_condition{job="kube-state-metrics",condition="Ready",status="true"} == 0
+ for: 15m
+ labels:
+ severity: warning
+ - alert: KubeNodeUnreachable
+ annotations:
+ message: '{{ $labels.node }} is unreachable and some workloads may be rescheduled.'
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubenodeunreachable
+ expr: |
+ kube_node_spec_taint{job="kube-state-metrics",key="node.kubernetes.io/unreachable",effect="NoSchedule"} == 1
+ labels:
+ severity: warning
+ - alert: KubeletTooManyPods
+ annotations:
+ message: Kubelet '{{ $labels.node }}' is running at {{ $value | humanizePercentage
+ }} of its Pod capacity.
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubelettoomanypods
+ expr: |
+ max(max(kubelet_running_pod_count{job="kubelet"}) by(instance) * on(instance) group_left(node) kubelet_node_name{job="kubelet"}) by(node) / max(kube_node_status_capacity_pods{job="kube-state-metrics"}) by(node) > 0.95
+ for: 15m
+ labels:
+ severity: warning
+ - alert: KubeletDown
+ annotations:
+ message: Kubelet has disappeared from Prometheus target discovery.
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeletdown
+ expr: |
+ absent(up{job="kubelet"} == 1)
+ for: 15m
+ labels:
+ severity: critical
+ - name: kubernetes-system-scheduler
+ rules:
+ - alert: KubeSchedulerDown
+ annotations:
+ message: KubeScheduler has disappeared from Prometheus target discovery.
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeschedulerdown
+ expr: |
+ absent(up{job="kube-scheduler"} == 1)
+ for: 15m
+ labels:
+ severity: critical
+ - name: kubernetes-system-controller-manager
+ rules:
+ - alert: KubeControllerManagerDown
+ annotations:
+ message: KubeControllerManager has disappeared from Prometheus target discovery.
+ runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecontrollermanagerdown
+ expr: |
+ absent(up{job="kube-controller-manager"} == 1)
+ for: 15m
+ labels:
+ severity: critical
- name: prometheus
rules:
- alert: PrometheusBadConfig
@@ -1115,8 +1075,8 @@ spec:
- alert: PrometheusRemoteWriteDesiredShards
annotations:
description: Prometheus {{$labels.namespace}}/{{$labels.pod}} remote write
- desired shards calculation wants to run {{ printf $value }} shards, which
- is more than the max of {{ printf `prometheus_remote_storage_shards_max{instance="%s",job="prometheus-k8s",namespace="monitoring"}`
+ desired shards calculation wants to run {{ $value }} shards, which is more
+ than the max of {{ printf `prometheus_remote_storage_shards_max{instance="%s",job="prometheus-k8s",namespace="monitoring"}`
$labels.instance | query | first | value }}.
summary: Prometheus remote write desired shards calculation wants to run more
than configured max shards.
@@ -1125,7 +1085,7 @@ spec:
# https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details.
(
max_over_time(prometheus_remote_storage_shards_desired{job="prometheus-k8s",namespace="monitoring"}[5m])
- > on(job, instance) group_right
+ >
max_over_time(prometheus_remote_storage_shards_max{job="prometheus-k8s",namespace="monitoring"}[5m])
)
for: 15m
diff --git a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index 43822f9ebe5b2733092779922fc1601fe56d4b8b..17dfb1604c391e63139184b0b8aba41a8a636328 100644
--- a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
@@ -15,16 +15,16 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
spec:
description: 'AlertmanagerSpec is a specification of the desired behavior
- of the Alertmanager cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
+ of the Alertmanager cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
properties:
additionalPeers:
description: AdditionalPeers allows injecting a set of additional Alertmanagers
@@ -626,6 +626,12 @@ spec:
items:
type: string
type: array
+ configSecret:
+ description: ConfigSecret is the name of a Kubernetes Secret in the
+ same namespace as the Alertmanager object, which contains configuration
+ for this Alertmanager instance. Defaults to 'alertmanager-<alertmanager-name>'
+ The secret is mounted into /etc/alertmanager/config.
+ type: string
containers:
description: Containers allows injecting additional containers. This
is meant to allow adding an authentication proxy to an Alertmanager
@@ -1051,7 +1057,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -1203,7 +1210,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -1352,7 +1360,124 @@ spec:
and is only honored by servers that enable the WindowsGMSA
feature flag.
type: string
+ runAsUserName:
+ description: The UserName in Windows to run the entrypoint
+ of the container process. Defaults to the user specified
+ in image metadata if unspecified. May also be set in
+ PodSecurityContext. If set in both SecurityContext and
+ PodSecurityContext, the value specified in SecurityContext
+ takes precedence. This field is alpha-level and it is
+ only honored by servers that enable the WindowsRunAsUserName
+ feature flag.
+ type: string
+ type: object
+ type: object
+ startupProbe:
+ description: Probe describes a health check to be performed against
+ a container to determine whether it is alive or ready to receive
+ traffic.
+ properties:
+ exec:
+ description: ExecAction describes a "run in container" action.
+ properties:
+ command:
+ description: Command is the command line to execute inside
+ the container, the working directory for the command is
+ root ('/') in the container's filesystem. The command
+ is simply exec'd, it is not run inside a shell, so traditional
+ shell instructions ('|', etc) won't work. To use a shell,
+ you need to explicitly call out to that shell. Exit
+ status of 0 is treated as live/healthy and non-zero
+ is unhealthy.
+ items:
+ type: string
+ type: array
+ type: object
+ failureThreshold:
+ description: Minimum consecutive failures for the probe to
+ be considered failed after having succeeded. Defaults to
+ 3. Minimum value is 1.
+ format: int32
+ type: integer
+ httpGet:
+ description: HTTPGetAction describes an action based on HTTP
+ Get requests.
+ properties:
+ host:
+ description: Host name to connect to, defaults to the
+ pod IP. You probably want to set "Host" in httpHeaders
+ instead.
+ type: string
+ httpHeaders:
+ description: Custom headers to set in the request. HTTP
+ allows repeated headers.
+ items:
+ description: HTTPHeader describes a custom header to
+ be used in HTTP probes
+ properties:
+ name:
+ description: The header field name
+ type: string
+ value:
+ description: The header field value
+ type: string
+ required:
+ - name
+ - value
+ type: object
+ type: array
+ path:
+ description: Path to access on the HTTP server.
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ scheme:
+ description: Scheme to use for connecting to the host.
+ Defaults to HTTP.
+ type: string
+ required:
+ - port
+ type: object
+ initialDelaySeconds:
+ description: 'Number of seconds after the container has started
+ before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
+ periodSeconds:
+ description: How often (in seconds) to perform the probe.
+ Default to 10 seconds. Minimum value is 1.
+ format: int32
+ type: integer
+ successThreshold:
+ description: Minimum consecutive successes for the probe to
+ be considered successful after having failed. Defaults to
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
+ format: int32
+ type: integer
+ tcpSocket:
+ description: TCPSocketAction describes an action based on
+ opening a socket
+ properties:
+ host:
+ description: 'Optional: Host name to connect to, defaults
+ to the pod IP.'
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ required:
+ - port
type: object
+ timeoutSeconds:
+ description: 'Number of seconds after which the probe times
+ out. Defaults to 1 second. Minimum value is 1. More info:
+ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
type: object
stdin:
description: Whether this container should allocate a buffer for
@@ -1918,7 +2043,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -2070,7 +2196,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -2219,8 +2346,125 @@ spec:
and is only honored by servers that enable the WindowsGMSA
feature flag.
type: string
+ runAsUserName:
+ description: The UserName in Windows to run the entrypoint
+ of the container process. Defaults to the user specified
+ in image metadata if unspecified. May also be set in
+ PodSecurityContext. If set in both SecurityContext and
+ PodSecurityContext, the value specified in SecurityContext
+ takes precedence. This field is alpha-level and it is
+ only honored by servers that enable the WindowsRunAsUserName
+ feature flag.
+ type: string
type: object
type: object
+ startupProbe:
+ description: Probe describes a health check to be performed against
+ a container to determine whether it is alive or ready to receive
+ traffic.
+ properties:
+ exec:
+ description: ExecAction describes a "run in container" action.
+ properties:
+ command:
+ description: Command is the command line to execute inside
+ the container, the working directory for the command is
+ root ('/') in the container's filesystem. The command
+ is simply exec'd, it is not run inside a shell, so traditional
+ shell instructions ('|', etc) won't work. To use a shell,
+ you need to explicitly call out to that shell. Exit
+ status of 0 is treated as live/healthy and non-zero
+ is unhealthy.
+ items:
+ type: string
+ type: array
+ type: object
+ failureThreshold:
+ description: Minimum consecutive failures for the probe to
+ be considered failed after having succeeded. Defaults to
+ 3. Minimum value is 1.
+ format: int32
+ type: integer
+ httpGet:
+ description: HTTPGetAction describes an action based on HTTP
+ Get requests.
+ properties:
+ host:
+ description: Host name to connect to, defaults to the
+ pod IP. You probably want to set "Host" in httpHeaders
+ instead.
+ type: string
+ httpHeaders:
+ description: Custom headers to set in the request. HTTP
+ allows repeated headers.
+ items:
+ description: HTTPHeader describes a custom header to
+ be used in HTTP probes
+ properties:
+ name:
+ description: The header field name
+ type: string
+ value:
+ description: The header field value
+ type: string
+ required:
+ - name
+ - value
+ type: object
+ type: array
+ path:
+ description: Path to access on the HTTP server.
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ scheme:
+ description: Scheme to use for connecting to the host.
+ Defaults to HTTP.
+ type: string
+ required:
+ - port
+ type: object
+ initialDelaySeconds:
+ description: 'Number of seconds after the container has started
+ before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
+ periodSeconds:
+ description: How often (in seconds) to perform the probe.
+ Default to 10 seconds. Minimum value is 1.
+ format: int32
+ type: integer
+ successThreshold:
+ description: Minimum consecutive successes for the probe to
+ be considered successful after having failed. Defaults to
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
+ format: int32
+ type: integer
+ tcpSocket:
+ description: TCPSocketAction describes an action based on
+ opening a socket
+ properties:
+ host:
+ description: 'Optional: Host name to connect to, defaults
+ to the pod IP.'
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ required:
+ - port
+ type: object
+ timeoutSeconds:
+ description: 'Number of seconds after which the probe times
+ out. Defaults to 1 second. Minimum value is 1. More info:
+ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
+ type: object
stdin:
description: Whether this container should allocate a buffer for
stdin in the container runtime. If this is not set, reads from
@@ -2397,179 +2641,13 @@ spec:
If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).
- Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency
+ Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
generation:
description: A sequence number representing a specific generation
of the desired state. Populated by the system. Read-only.
format: int64
type: integer
- initializers:
- description: Initializers tracks the progress of initialization.
- properties:
- pending:
- description: Pending is a list of initializers that must execute
- in order before this object is visible. When the last pending
- initializer is removed, and no failing result is set, the
- initializers struct will be set to nil and the object is considered
- as initialized and visible to all clients.
- items:
- description: Initializer is information about an initializer
- that has not yet completed.
- properties:
- name:
- description: name of the process that is responsible for
- initializing this object.
- type: string
- required:
- - name
- type: object
- type: array
- result:
- description: Status is a return value for calls that don't return
- other objects.
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of
- this representation of an object. Servers should convert
- recognized schemas to the latest internal value, and may
- reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
- type: string
- code:
- description: Suggested HTTP return code for this status,
- 0 if not set.
- format: int32
- type: integer
- details:
- description: StatusDetails is a set of additional properties
- that MAY be set by the server to provide additional information
- about a response. The Reason field of a Status object
- defines what attributes will be set. Clients must ignore
- fields that do not match the defined type of each attribute,
- and should assume that any attribute may be empty, invalid,
- or under defined.
- properties:
- causes:
- description: The Causes array includes more details
- associated with the StatusReason failure. Not all
- StatusReasons may provide detailed causes.
- items:
- description: StatusCause provides more information
- about an api.Status failure, including cases when
- multiple errors are encountered.
- properties:
- field:
- description: |-
- The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
- Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"
- type: string
- message:
- description: A human-readable description of the
- cause of the error. This field may be presented
- as-is to a reader.
- type: string
- reason:
- description: A machine-readable description of
- the cause of the error. If this value is empty
- there is no information available.
- type: string
- type: object
- type: array
- group:
- description: The group attribute of the resource associated
- with the status StatusReason.
- type: string
- kind:
- description: 'The kind attribute of the resource associated
- with the status StatusReason. On some operations may
- differ from the requested resource Kind. More info:
- https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- name:
- description: The name attribute of the resource associated
- with the status StatusReason (when there is a single
- name which can be described).
- type: string
- retryAfterSeconds:
- description: If specified, the time in seconds before
- the operation should be retried. Some errors may indicate
- the client must take an alternate action - for those
- errors this field may indicate how long to wait before
- taking the alternate action.
- format: int32
- type: integer
- uid:
- description: 'UID of the resource. (when there is a
- single resource which can be described). More info:
- http://kubernetes.io/docs/user-guide/identifiers#uids'
- type: string
- type: object
- kind:
- description: 'Kind is a string value representing the REST
- resource this object represents. Servers may infer this
- from the endpoint the client submits requests to. Cannot
- be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- message:
- description: A human-readable description of the status
- of this operation.
- type: string
- metadata:
- description: ListMeta describes metadata that synthetic
- resources must have, including lists and various status
- objects. A resource may have only one of {ObjectMeta,
- ListMeta}.
- properties:
- continue:
- description: continue may be set if the user set a limit
- on the number of items returned, and indicates that
- the server has more data available. The value is opaque
- and may be used to issue another request to the endpoint
- that served this list to retrieve the next set of
- available objects. Continuing a consistent list may
- not be possible if the server configuration has changed
- or more than a few minutes have passed. The resourceVersion
- field returned when using this continue value will
- be identical to the value in the first response, unless
- you have received this token from an error message.
- type: string
- remainingItemCount:
- description: |-
- remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.
-
- This field is alpha and can be changed or removed without notice.
- format: int64
- type: integer
- resourceVersion:
- description: 'String that identifies the server''s internal
- version of this object that can be used by clients
- to determine when objects have changed. Value must
- be treated as opaque by clients and passed unmodified
- back to the server. Populated by the system. Read-only.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
- type: string
- selfLink:
- description: selfLink is a URL representing this object.
- Populated by the system. Read-only.
- type: string
- type: object
- reason:
- description: A machine-readable description of why this
- operation is in the "Failure" status. If this value is
- empty there is no information available. A Reason clarifies
- an HTTP status code but does not override it.
- type: string
- status:
- description: 'Status of the operation. One of: "Success"
- or "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
- type: string
- type: object
- required:
- - pending
- type: object
labels:
description: 'Map of string keys and values that can be used to
organize and categorize (scope and select) objects. May match
@@ -2577,10 +2655,13 @@ spec:
http://kubernetes.io/docs/user-guide/labels'
type: object
managedFields:
- description: |-
- ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like "ci-cd". The set of fields is always in the version that the workflow used when modifying the object.
-
- This field is alpha and can be changed or removed without notice.
+ description: ManagedFields maps workflow-id and version to the set
+ of fields that are managed by that workflow. This is mostly for
+ internal housekeeping, and users typically shouldn't need to set
+ or understand this field. A workflow can be the user's name, a
+ controller's name, or the name of a specific apply path like "ci-cd".
+ The set of fields is always in the version that the workflow used
+ when modifying the object.
items:
description: ManagedFieldsEntry is a workflow-id, a FieldSet and
the group version of the resource that the fieldset applies
@@ -2593,9 +2674,18 @@ spec:
to track the version of a field set because it cannot be
automatically converted.
type: string
- fields:
- description: 'Fields stores a set of fields in a data structure
- like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff'
+ fieldsType:
+ description: 'FieldsType is the discriminator for the different
+ fields format and version. There is currently only one possible
+ value: "FieldsV1"'
+ type: string
+ fieldsV1:
+ description: |-
+ FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.
+
+ Each key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.
+
+ The exact format is defined in sigs.k8s.io/structured-merge-diff
type: object
manager:
description: Manager is an identifier of the workflow managing
@@ -2654,7 +2744,7 @@ spec:
controller.
type: boolean
kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
@@ -2673,11 +2763,13 @@ spec:
description: |-
An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.
- Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+ Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
type: string
selfLink:
- description: SelfLink is a URL representing this object. Populated
- by the system. Read-only.
+ description: |-
+ SelfLink is a URL representing this object. Populated by the system. Read-only.
+
+ DEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.
type: string
uid:
description: |-
@@ -2835,6 +2927,15 @@ spec:
credential spec to use. This field is alpha-level and is only
honored by servers that enable the WindowsGMSA feature flag.
type: string
+ runAsUserName:
+ description: The UserName in Windows to run the entrypoint of
+ the container process. Defaults to the user specified in image
+ metadata if unspecified. May also be set in PodSecurityContext.
+ If set in both SecurityContext and PodSecurityContext, the
+ value specified in SecurityContext takes precedence. This
+ field is alpha-level and it is only honored by servers that
+ enable the WindowsRunAsUserName feature flag.
+ type: string
type: object
type: object
serviceAccountName:
@@ -2872,13 +2973,13 @@ spec:
description: 'APIVersion defines the versioned schema of this
representation of an object. Servers should convert recognized
schemas to the latest internal value, and may reject unrecognized
- values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource
this object represents. Servers may infer this from the endpoint
the client submits requests to. Cannot be updated. In CamelCase.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: ObjectMeta is metadata that all persisted resources
@@ -2934,190 +3035,13 @@ spec:
If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).
- Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency
+ Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
generation:
description: A sequence number representing a specific generation
of the desired state. Populated by the system. Read-only.
format: int64
type: integer
- initializers:
- description: Initializers tracks the progress of initialization.
- properties:
- pending:
- description: Pending is a list of initializers that
- must execute in order before this object is visible.
- When the last pending initializer is removed, and
- no failing result is set, the initializers struct
- will be set to nil and the object is considered as
- initialized and visible to all clients.
- items:
- description: Initializer is information about an initializer
- that has not yet completed.
- properties:
- name:
- description: name of the process that is responsible
- for initializing this object.
- type: string
- required:
- - name
- type: object
- type: array
- result:
- description: Status is a return value for calls that
- don't return other objects.
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema
- of this representation of an object. Servers should
- convert recognized schemas to the latest internal
- value, and may reject unrecognized values. More
- info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
- type: string
- code:
- description: Suggested HTTP return code for this
- status, 0 if not set.
- format: int32
- type: integer
- details:
- description: StatusDetails is a set of additional
- properties that MAY be set by the server to provide
- additional information about a response. The Reason
- field of a Status object defines what attributes
- will be set. Clients must ignore fields that do
- not match the defined type of each attribute,
- and should assume that any attribute may be empty,
- invalid, or under defined.
- properties:
- causes:
- description: The Causes array includes more
- details associated with the StatusReason failure.
- Not all StatusReasons may provide detailed
- causes.
- items:
- description: StatusCause provides more information
- about an api.Status failure, including cases
- when multiple errors are encountered.
- properties:
- field:
- description: |-
- The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
- Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"
- type: string
- message:
- description: A human-readable description
- of the cause of the error. This field
- may be presented as-is to a reader.
- type: string
- reason:
- description: A machine-readable description
- of the cause of the error. If this value
- is empty there is no information available.
- type: string
- type: object
- type: array
- group:
- description: The group attribute of the resource
- associated with the status StatusReason.
- type: string
- kind:
- description: 'The kind attribute of the resource
- associated with the status StatusReason. On
- some operations may differ from the requested
- resource Kind. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- name:
- description: The name attribute of the resource
- associated with the status StatusReason (when
- there is a single name which can be described).
- type: string
- retryAfterSeconds:
- description: If specified, the time in seconds
- before the operation should be retried. Some
- errors may indicate the client must take an
- alternate action - for those errors this field
- may indicate how long to wait before taking
- the alternate action.
- format: int32
- type: integer
- uid:
- description: 'UID of the resource. (when there
- is a single resource which can be described).
- More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
- type: string
- type: object
- kind:
- description: 'Kind is a string value representing
- the REST resource this object represents. Servers
- may infer this from the endpoint the client submits
- requests to. Cannot be updated. In CamelCase.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- message:
- description: A human-readable description of the
- status of this operation.
- type: string
- metadata:
- description: ListMeta describes metadata that synthetic
- resources must have, including lists and various
- status objects. A resource may have only one of
- {ObjectMeta, ListMeta}.
- properties:
- continue:
- description: continue may be set if the user
- set a limit on the number of items returned,
- and indicates that the server has more data
- available. The value is opaque and may be
- used to issue another request to the endpoint
- that served this list to retrieve the next
- set of available objects. Continuing a consistent
- list may not be possible if the server configuration
- has changed or more than a few minutes have
- passed. The resourceVersion field returned
- when using this continue value will be identical
- to the value in the first response, unless
- you have received this token from an error
- message.
- type: string
- remainingItemCount:
- description: |-
- remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.
-
- This field is alpha and can be changed or removed without notice.
- format: int64
- type: integer
- resourceVersion:
- description: 'String that identifies the server''s
- internal version of this object that can be
- used by clients to determine when objects
- have changed. Value must be treated as opaque
- by clients and passed unmodified back to the
- server. Populated by the system. Read-only.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
- type: string
- selfLink:
- description: selfLink is a URL representing
- this object. Populated by the system. Read-only.
- type: string
- type: object
- reason:
- description: A machine-readable description of why
- this operation is in the "Failure" status. If
- this value is empty there is no information available.
- A Reason clarifies an HTTP status code but does
- not override it.
- type: string
- status:
- description: 'Status of the operation. One of: "Success"
- or "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
- type: string
- type: object
- required:
- - pending
- type: object
labels:
description: 'Map of string keys and values that can be
used to organize and categorize (scope and select) objects.
@@ -3125,10 +3049,14 @@ spec:
More info: http://kubernetes.io/docs/user-guide/labels'
type: object
managedFields:
- description: |-
- ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like "ci-cd". The set of fields is always in the version that the workflow used when modifying the object.
-
- This field is alpha and can be changed or removed without notice.
+ description: ManagedFields maps workflow-id and version
+ to the set of fields that are managed by that workflow.
+ This is mostly for internal housekeeping, and users typically
+ shouldn't need to set or understand this field. A workflow
+ can be the user's name, a controller's name, or the name
+ of a specific apply path like "ci-cd". The set of fields
+ is always in the version that the workflow used when modifying
+ the object.
items:
description: ManagedFieldsEntry is a workflow-id, a FieldSet
and the group version of the resource that the fieldset
@@ -3141,10 +3069,18 @@ spec:
field. It is necessary to track the version of a
field set because it cannot be automatically converted.
type: string
- fields:
- description: 'Fields stores a set of fields in a data
- structure like a Trie. To understand how this is
- used, see: https://github.com/kubernetes-sigs/structured-merge-diff'
+ fieldsType:
+ description: 'FieldsType is the discriminator for
+ the different fields format and version. There is
+ currently only one possible value: "FieldsV1"'
+ type: string
+ fieldsV1:
+ description: |-
+ FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.
+
+ Each key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.
+
+ The exact format is defined in sigs.k8s.io/structured-merge-diff
type: object
manager:
description: Manager is an identifier of the workflow
@@ -3208,7 +3144,7 @@ spec:
managing controller.
type: boolean
kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
@@ -3227,11 +3163,13 @@ spec:
description: |-
An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.
- Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+ Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
type: string
selfLink:
- description: SelfLink is a URL representing this object.
- Populated by the system. Read-only.
+ description: |-
+ SelfLink is a URL representing this object. Populated by the system. Read-only.
+
+ DEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.
type: string
uid:
description: |-
@@ -3597,7 +3535,7 @@ spec:
properties:
monitors:
description: 'Required: Monitors is a collection of Ceph monitors
- More info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
items:
type: string
type: array
@@ -3608,11 +3546,11 @@ spec:
readOnly:
description: 'Optional: Defaults to false (read/write). ReadOnly
here will force the ReadOnly setting in VolumeMounts. More
- info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
type: boolean
secretFile:
description: 'Optional: SecretFile is the path to key ring
- for User, default is /etc/ceph/user.secret More info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
type: string
secretRef:
description: LocalObjectReference contains enough information
@@ -3625,7 +3563,7 @@ spec:
type: object
user:
description: 'Optional: User is the rados user name, default
- is admin More info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
type: string
required:
- monitors
@@ -3640,12 +3578,12 @@ spec:
description: 'Filesystem type to mount. Must be a filesystem
type supported by the host operating system. Examples: "ext4",
"xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
- More info: https://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md'
+ More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
type: string
readOnly:
description: 'Optional: Defaults to false (read/write). ReadOnly
here will force the ReadOnly setting in VolumeMounts. More
- info: https://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md'
+ info: https://examples.k8s.io/mysql-cinder-pd/README.md'
type: boolean
secretRef:
description: LocalObjectReference contains enough information
@@ -3657,8 +3595,8 @@ spec:
type: string
type: object
volumeID:
- description: 'volume id used to identify the volume in cinder
- More info: https://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md'
+ description: 'volume id used to identify the volume in cinder.
+ More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
type: string
required:
- volumeID
@@ -3981,16 +3919,16 @@ spec:
properties:
endpoints:
description: 'EndpointsName is the endpoint name that details
- Glusterfs topology. More info: https://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod'
+ Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
type: string
path:
description: 'Path is the Glusterfs volume path. More info:
- https://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod'
+ https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
type: string
readOnly:
description: 'ReadOnly here will force the Glusterfs volume
to be mounted with read-only permissions. Defaults to false.
- More info: https://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod'
+ More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
type: boolean
required:
- endpoints
@@ -4437,24 +4375,24 @@ spec:
https://kubernetes.io/docs/concepts/storage/volumes#rbd'
type: string
image:
- description: 'The rados image name. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
keyring:
description: 'Keyring is the path to key ring for RBDUser.
- Default is /etc/ceph/keyring. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
monitors:
- description: 'A collection of Ceph monitors. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ description: 'A collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
items:
type: string
type: array
pool:
description: 'The rados pool name. Default is rbd. More info:
- https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
readOnly:
description: 'ReadOnly here will force the ReadOnly setting
- in VolumeMounts. Defaults to false. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: boolean
secretRef:
description: LocalObjectReference contains enough information
@@ -4467,7 +4405,7 @@ spec:
type: object
user:
description: 'The rados user name. Default is admin. More
- info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
required:
- monitors
@@ -4654,7 +4592,7 @@ spec:
status:
description: 'AlertmanagerStatus is the most recent observed status of the
Alertmanager cluster. Read-only. Not included when requesting from the
- apiserver, only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
+ apiserver, only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
properties:
availableReplicas:
description: Total number of available pods (ready for at least minReadySeconds)
diff --git a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
index ff67150faded62d607e8d8902b9a4e6185f9ce74..8062b3dda8c082ca8eb51b17dd332063e94c5066 100644
--- a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
@@ -15,12 +15,12 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
spec:
description: PodMonitorSpec contains specification parameters for a PodMonitor.
@@ -52,6 +52,10 @@ spec:
description: HonorLabels chooses the metric's labels on collisions
with target labels.
type: boolean
+ honorTimestamps:
+ description: HonorTimestamps controls whether Prometheus respects
+ the timestamps present in scraped data.
+ type: boolean
interval:
description: Interval at which metrics should be scraped
type: string
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index bcf97c2c784f79201b5b83f3007b8166648dfeb3..9c450819cc7245655484b350efaca762bf020394 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -15,12 +15,12 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
spec:
description: 'PrometheusSpec is a specification of the desired behavior
@@ -693,18 +693,40 @@ spec:
tlsConfig:
description: TLSConfig specifies TLS configuration parameters.
properties:
+ ca: {}
caFile:
- description: The CA cert to use for the targets.
+ description: Path to the CA cert in the Prometheus container
+ to use for the targets.
type: string
+ cert: {}
certFile:
- description: The client cert file for the targets.
+ description: Path to the client cert file in the Prometheus
+ container for the targets.
type: string
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keyFile:
- description: The client key file for the targets.
+ description: Path to the client key file in the Prometheus
+ container for the targets.
type: string
+ keySecret:
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key
+ must be defined
+ type: boolean
+ required:
+ - key
+ type: object
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -774,18 +796,40 @@ spec:
tlsConfig:
description: TLSConfig specifies TLS configuration parameters.
properties:
+ ca: {}
caFile:
- description: The CA cert to use for the targets.
+ description: Path to the CA cert in the Prometheus container
+ to use for the targets.
type: string
+ cert: {}
certFile:
- description: The client cert file for the targets.
+ description: Path to the client cert file in the Prometheus
+ container for the targets.
type: string
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keyFile:
- description: The client key file for the targets.
+ description: Path to the client key file in the Prometheus container
+ for the targets.
type: string
+ keySecret:
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must
+ be defined
+ type: boolean
+ required:
+ - key
+ type: object
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -793,6 +837,7 @@ spec:
required:
- host
type: object
+ arbitraryFSAccessThroughSMs: {}
baseImage:
description: Base image to use for a Prometheus deployment.
type: string
@@ -1235,7 +1280,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -1387,7 +1433,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -1536,7 +1583,124 @@ spec:
and is only honored by servers that enable the WindowsGMSA
feature flag.
type: string
+ runAsUserName:
+ description: The UserName in Windows to run the entrypoint
+ of the container process. Defaults to the user specified
+ in image metadata if unspecified. May also be set in
+ PodSecurityContext. If set in both SecurityContext and
+ PodSecurityContext, the value specified in SecurityContext
+ takes precedence. This field is alpha-level and it is
+ only honored by servers that enable the WindowsRunAsUserName
+ feature flag.
+ type: string
+ type: object
+ type: object
+ startupProbe:
+ description: Probe describes a health check to be performed against
+ a container to determine whether it is alive or ready to receive
+ traffic.
+ properties:
+ exec:
+ description: ExecAction describes a "run in container" action.
+ properties:
+ command:
+ description: Command is the command line to execute inside
+ the container, the working directory for the command is
+ root ('/') in the container's filesystem. The command
+ is simply exec'd, it is not run inside a shell, so traditional
+ shell instructions ('|', etc) won't work. To use a shell,
+ you need to explicitly call out to that shell. Exit
+ status of 0 is treated as live/healthy and non-zero
+ is unhealthy.
+ items:
+ type: string
+ type: array
+ type: object
+ failureThreshold:
+ description: Minimum consecutive failures for the probe to
+ be considered failed after having succeeded. Defaults to
+ 3. Minimum value is 1.
+ format: int32
+ type: integer
+ httpGet:
+ description: HTTPGetAction describes an action based on HTTP
+ Get requests.
+ properties:
+ host:
+ description: Host name to connect to, defaults to the
+ pod IP. You probably want to set "Host" in httpHeaders
+ instead.
+ type: string
+ httpHeaders:
+ description: Custom headers to set in the request. HTTP
+ allows repeated headers.
+ items:
+ description: HTTPHeader describes a custom header to
+ be used in HTTP probes
+ properties:
+ name:
+ description: The header field name
+ type: string
+ value:
+ description: The header field value
+ type: string
+ required:
+ - name
+ - value
+ type: object
+ type: array
+ path:
+ description: Path to access on the HTTP server.
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ scheme:
+ description: Scheme to use for connecting to the host.
+ Defaults to HTTP.
+ type: string
+ required:
+ - port
+ type: object
+ initialDelaySeconds:
+ description: 'Number of seconds after the container has started
+ before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
+ periodSeconds:
+ description: How often (in seconds) to perform the probe.
+ Default to 10 seconds. Minimum value is 1.
+ format: int32
+ type: integer
+ successThreshold:
+ description: Minimum consecutive successes for the probe to
+ be considered successful after having failed. Defaults to
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
+ format: int32
+ type: integer
+ tcpSocket:
+ description: TCPSocketAction describes an action based on
+ opening a socket
+ properties:
+ host:
+ description: 'Optional: Host name to connect to, defaults
+ to the pod IP.'
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ required:
+ - port
type: object
+ timeoutSeconds:
+ description: 'Number of seconds after which the probe times
+ out. Defaults to 1 second. Minimum value is 1. More info:
+ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
type: object
stdin:
description: Whether this container should allocate a buffer for
@@ -1655,6 +1819,11 @@ spec:
authentication authorization via a proxy to ensure only clients authorized
to perform these actions can do so. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis'
type: boolean
+ enforcedNamespaceLabel:
+ description: EnforcedNamespaceLabel enforces adding a namespace label
+ of origin for each alert and metric that is user created. The label
+ value will always be the namespace of the object that is being created.
+ type: string
evaluationInterval:
description: Interval between consecutive evaluations.
type: string
@@ -1667,6 +1836,12 @@ spec:
under. This is necessary to generate correct URLs. This is necessary
if Prometheus is not served from root of a DNS name.
type: string
+ ignoreNamespaceSelectors:
+ description: IgnoreNamespaceSelectors if set to true will ignore NamespaceSelector
+ settings from the podmonitor and servicemonitor configs, and they
+ will only discover endpoints within their current namespace. Defaults
+ to false.
+ type: boolean
image:
description: Image if specified has precedence over baseImage, tag and
sha combinations. Specifying the version is still necessary to ensure
@@ -2117,7 +2292,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -2269,7 +2445,8 @@ spec:
successThreshold:
description: Minimum consecutive successes for the probe to
be considered successful after having failed. Defaults to
- 1. Must be 1 for liveness. Minimum value is 1.
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
format: int32
type: integer
tcpSocket:
@@ -2418,8 +2595,125 @@ spec:
and is only honored by servers that enable the WindowsGMSA
feature flag.
type: string
+ runAsUserName:
+ description: The UserName in Windows to run the entrypoint
+ of the container process. Defaults to the user specified
+ in image metadata if unspecified. May also be set in
+ PodSecurityContext. If set in both SecurityContext and
+ PodSecurityContext, the value specified in SecurityContext
+ takes precedence. This field is alpha-level and it is
+ only honored by servers that enable the WindowsRunAsUserName
+ feature flag.
+ type: string
type: object
type: object
+ startupProbe:
+ description: Probe describes a health check to be performed against
+ a container to determine whether it is alive or ready to receive
+ traffic.
+ properties:
+ exec:
+ description: ExecAction describes a "run in container" action.
+ properties:
+ command:
+ description: Command is the command line to execute inside
+ the container, the working directory for the command is
+ root ('/') in the container's filesystem. The command
+ is simply exec'd, it is not run inside a shell, so traditional
+ shell instructions ('|', etc) won't work. To use a shell,
+ you need to explicitly call out to that shell. Exit
+ status of 0 is treated as live/healthy and non-zero
+ is unhealthy.
+ items:
+ type: string
+ type: array
+ type: object
+ failureThreshold:
+ description: Minimum consecutive failures for the probe to
+ be considered failed after having succeeded. Defaults to
+ 3. Minimum value is 1.
+ format: int32
+ type: integer
+ httpGet:
+ description: HTTPGetAction describes an action based on HTTP
+ Get requests.
+ properties:
+ host:
+ description: Host name to connect to, defaults to the
+ pod IP. You probably want to set "Host" in httpHeaders
+ instead.
+ type: string
+ httpHeaders:
+ description: Custom headers to set in the request. HTTP
+ allows repeated headers.
+ items:
+ description: HTTPHeader describes a custom header to
+ be used in HTTP probes
+ properties:
+ name:
+ description: The header field name
+ type: string
+ value:
+ description: The header field value
+ type: string
+ required:
+ - name
+ - value
+ type: object
+ type: array
+ path:
+ description: Path to access on the HTTP server.
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ scheme:
+ description: Scheme to use for connecting to the host.
+ Defaults to HTTP.
+ type: string
+ required:
+ - port
+ type: object
+ initialDelaySeconds:
+ description: 'Number of seconds after the container has started
+ before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
+ periodSeconds:
+ description: How often (in seconds) to perform the probe.
+ Default to 10 seconds. Minimum value is 1.
+ format: int32
+ type: integer
+ successThreshold:
+ description: Minimum consecutive successes for the probe to
+ be considered successful after having failed. Defaults to
+ 1. Must be 1 for liveness and startup. Minimum value is
+ 1.
+ format: int32
+ type: integer
+ tcpSocket:
+ description: TCPSocketAction describes an action based on
+ opening a socket
+ properties:
+ host:
+ description: 'Optional: Host name to connect to, defaults
+ to the pod IP.'
+ type: string
+ port:
+ anyOf:
+ - type: string
+ - type: integer
+ required:
+ - port
+ type: object
+ timeoutSeconds:
+ description: 'Number of seconds after which the probe times
+ out. Defaults to 1 second. Minimum value is 1. More info:
+ https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ format: int32
+ type: integer
+ type: object
stdin:
description: Whether this container should allocate a buffer for
stdin in the container runtime. If this is not set, reads from
@@ -2542,6 +2836,15 @@ spec:
nodeSelector:
description: Define which Nodes the Pods are scheduled on.
type: object
+ overrideHonorLabels:
+ description: OverrideHonorLabels if set to true overrides all user configured
+ honor_labels. If HonorLabels is set in ServiceMonitor or PodMonitor
+ to true, this overrides honor_labels to false.
+ type: boolean
+ overrideHonorTimestamps:
+ description: OverrideHonorTimestamps allows to globally enforce honoring
+ timestamps in all scrape configs.
+ type: boolean
paused:
description: When a Prometheus deployment is paused, no actions except
for deletion will be performed on the underlying objects.
@@ -2595,179 +2898,13 @@ spec:
If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).
- Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency
+ Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
generation:
description: A sequence number representing a specific generation
of the desired state. Populated by the system. Read-only.
format: int64
type: integer
- initializers:
- description: Initializers tracks the progress of initialization.
- properties:
- pending:
- description: Pending is a list of initializers that must execute
- in order before this object is visible. When the last pending
- initializer is removed, and no failing result is set, the
- initializers struct will be set to nil and the object is considered
- as initialized and visible to all clients.
- items:
- description: Initializer is information about an initializer
- that has not yet completed.
- properties:
- name:
- description: name of the process that is responsible for
- initializing this object.
- type: string
- required:
- - name
- type: object
- type: array
- result:
- description: Status is a return value for calls that don't return
- other objects.
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of
- this representation of an object. Servers should convert
- recognized schemas to the latest internal value, and may
- reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
- type: string
- code:
- description: Suggested HTTP return code for this status,
- 0 if not set.
- format: int32
- type: integer
- details:
- description: StatusDetails is a set of additional properties
- that MAY be set by the server to provide additional information
- about a response. The Reason field of a Status object
- defines what attributes will be set. Clients must ignore
- fields that do not match the defined type of each attribute,
- and should assume that any attribute may be empty, invalid,
- or under defined.
- properties:
- causes:
- description: The Causes array includes more details
- associated with the StatusReason failure. Not all
- StatusReasons may provide detailed causes.
- items:
- description: StatusCause provides more information
- about an api.Status failure, including cases when
- multiple errors are encountered.
- properties:
- field:
- description: |-
- The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
- Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"
- type: string
- message:
- description: A human-readable description of the
- cause of the error. This field may be presented
- as-is to a reader.
- type: string
- reason:
- description: A machine-readable description of
- the cause of the error. If this value is empty
- there is no information available.
- type: string
- type: object
- type: array
- group:
- description: The group attribute of the resource associated
- with the status StatusReason.
- type: string
- kind:
- description: 'The kind attribute of the resource associated
- with the status StatusReason. On some operations may
- differ from the requested resource Kind. More info:
- https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- name:
- description: The name attribute of the resource associated
- with the status StatusReason (when there is a single
- name which can be described).
- type: string
- retryAfterSeconds:
- description: If specified, the time in seconds before
- the operation should be retried. Some errors may indicate
- the client must take an alternate action - for those
- errors this field may indicate how long to wait before
- taking the alternate action.
- format: int32
- type: integer
- uid:
- description: 'UID of the resource. (when there is a
- single resource which can be described). More info:
- http://kubernetes.io/docs/user-guide/identifiers#uids'
- type: string
- type: object
- kind:
- description: 'Kind is a string value representing the REST
- resource this object represents. Servers may infer this
- from the endpoint the client submits requests to. Cannot
- be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- message:
- description: A human-readable description of the status
- of this operation.
- type: string
- metadata:
- description: ListMeta describes metadata that synthetic
- resources must have, including lists and various status
- objects. A resource may have only one of {ObjectMeta,
- ListMeta}.
- properties:
- continue:
- description: continue may be set if the user set a limit
- on the number of items returned, and indicates that
- the server has more data available. The value is opaque
- and may be used to issue another request to the endpoint
- that served this list to retrieve the next set of
- available objects. Continuing a consistent list may
- not be possible if the server configuration has changed
- or more than a few minutes have passed. The resourceVersion
- field returned when using this continue value will
- be identical to the value in the first response, unless
- you have received this token from an error message.
- type: string
- remainingItemCount:
- description: |-
- remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.
-
- This field is alpha and can be changed or removed without notice.
- format: int64
- type: integer
- resourceVersion:
- description: 'String that identifies the server''s internal
- version of this object that can be used by clients
- to determine when objects have changed. Value must
- be treated as opaque by clients and passed unmodified
- back to the server. Populated by the system. Read-only.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
- type: string
- selfLink:
- description: selfLink is a URL representing this object.
- Populated by the system. Read-only.
- type: string
- type: object
- reason:
- description: A machine-readable description of why this
- operation is in the "Failure" status. If this value is
- empty there is no information available. A Reason clarifies
- an HTTP status code but does not override it.
- type: string
- status:
- description: 'Status of the operation. One of: "Success"
- or "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
- type: string
- type: object
- required:
- - pending
- type: object
labels:
description: 'Map of string keys and values that can be used to
organize and categorize (scope and select) objects. May match
@@ -2775,10 +2912,13 @@ spec:
http://kubernetes.io/docs/user-guide/labels'
type: object
managedFields:
- description: |-
- ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like "ci-cd". The set of fields is always in the version that the workflow used when modifying the object.
-
- This field is alpha and can be changed or removed without notice.
+ description: ManagedFields maps workflow-id and version to the set
+ of fields that are managed by that workflow. This is mostly for
+ internal housekeeping, and users typically shouldn't need to set
+ or understand this field. A workflow can be the user's name, a
+ controller's name, or the name of a specific apply path like "ci-cd".
+ The set of fields is always in the version that the workflow used
+ when modifying the object.
items:
description: ManagedFieldsEntry is a workflow-id, a FieldSet and
the group version of the resource that the fieldset applies
@@ -2791,9 +2931,18 @@ spec:
to track the version of a field set because it cannot be
automatically converted.
type: string
- fields:
- description: 'Fields stores a set of fields in a data structure
- like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff'
+ fieldsType:
+ description: 'FieldsType is the discriminator for the different
+ fields format and version. There is currently only one possible
+ value: "FieldsV1"'
+ type: string
+ fieldsV1:
+ description: |-
+ FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.
+
+ Each key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.
+
+ The exact format is defined in sigs.k8s.io/structured-merge-diff
type: object
manager:
description: Manager is an identifier of the workflow managing
@@ -2852,7 +3001,7 @@ spec:
controller.
type: boolean
kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
@@ -2871,11 +3020,13 @@ spec:
description: |-
An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.
- Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+ Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
type: string
selfLink:
- description: SelfLink is a URL representing this object. Populated
- by the system. Read-only.
+ description: |-
+ SelfLink is a URL representing this object. Populated by the system. Read-only.
+
+ DEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.
type: string
uid:
description: |-
@@ -3076,18 +3227,40 @@ spec:
tlsConfig:
description: TLSConfig specifies TLS configuration parameters.
properties:
+ ca: {}
caFile:
- description: The CA cert to use for the targets.
+ description: Path to the CA cert in the Prometheus container
+ to use for the targets.
type: string
+ cert: {}
certFile:
- description: The client cert file for the targets.
+ description: Path to the client cert file in the Prometheus
+ container for the targets.
type: string
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keyFile:
- description: The client key file for the targets.
+ description: Path to the client key file in the Prometheus
+ container for the targets.
type: string
+ keySecret:
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must
+ be defined
+ type: boolean
+ required:
+ - key
+ type: object
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3202,18 +3375,40 @@ spec:
tlsConfig:
description: TLSConfig specifies TLS configuration parameters.
properties:
+ ca: {}
caFile:
- description: The CA cert to use for the targets.
+ description: Path to the CA cert in the Prometheus container
+ to use for the targets.
type: string
+ cert: {}
certFile:
- description: The client cert file for the targets.
+ description: Path to the client cert file in the Prometheus
+ container for the targets.
type: string
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keyFile:
- description: The client key file for the targets.
+ description: Path to the client key file in the Prometheus
+ container for the targets.
type: string
+ keySecret:
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must
+ be defined
+ type: boolean
+ required:
+ - key
+ type: object
serverName:
description: Used to verify the hostname for the targets.
type: string
@@ -3530,6 +3725,15 @@ spec:
credential spec to use. This field is alpha-level and is only
honored by servers that enable the WindowsGMSA feature flag.
type: string
+ runAsUserName:
+ description: The UserName in Windows to run the entrypoint of
+ the container process. Defaults to the user specified in image
+ metadata if unspecified. May also be set in PodSecurityContext.
+ If set in both SecurityContext and PodSecurityContext, the
+ value specified in SecurityContext takes precedence. This
+ field is alpha-level and it is only honored by servers that
+ enable the WindowsRunAsUserName feature flag.
+ type: string
type: object
type: object
serviceAccountName:
@@ -3655,13 +3859,13 @@ spec:
description: 'APIVersion defines the versioned schema of this
representation of an object. Servers should convert recognized
schemas to the latest internal value, and may reject unrecognized
- values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource
this object represents. Servers may infer this from the endpoint
the client submits requests to. Cannot be updated. In CamelCase.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: ObjectMeta is metadata that all persisted resources
@@ -3717,190 +3921,13 @@ spec:
If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).
- Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency
+ Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
generation:
description: A sequence number representing a specific generation
of the desired state. Populated by the system. Read-only.
format: int64
type: integer
- initializers:
- description: Initializers tracks the progress of initialization.
- properties:
- pending:
- description: Pending is a list of initializers that
- must execute in order before this object is visible.
- When the last pending initializer is removed, and
- no failing result is set, the initializers struct
- will be set to nil and the object is considered as
- initialized and visible to all clients.
- items:
- description: Initializer is information about an initializer
- that has not yet completed.
- properties:
- name:
- description: name of the process that is responsible
- for initializing this object.
- type: string
- required:
- - name
- type: object
- type: array
- result:
- description: Status is a return value for calls that
- don't return other objects.
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema
- of this representation of an object. Servers should
- convert recognized schemas to the latest internal
- value, and may reject unrecognized values. More
- info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
- type: string
- code:
- description: Suggested HTTP return code for this
- status, 0 if not set.
- format: int32
- type: integer
- details:
- description: StatusDetails is a set of additional
- properties that MAY be set by the server to provide
- additional information about a response. The Reason
- field of a Status object defines what attributes
- will be set. Clients must ignore fields that do
- not match the defined type of each attribute,
- and should assume that any attribute may be empty,
- invalid, or under defined.
- properties:
- causes:
- description: The Causes array includes more
- details associated with the StatusReason failure.
- Not all StatusReasons may provide detailed
- causes.
- items:
- description: StatusCause provides more information
- about an api.Status failure, including cases
- when multiple errors are encountered.
- properties:
- field:
- description: |-
- The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
- Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"
- type: string
- message:
- description: A human-readable description
- of the cause of the error. This field
- may be presented as-is to a reader.
- type: string
- reason:
- description: A machine-readable description
- of the cause of the error. If this value
- is empty there is no information available.
- type: string
- type: object
- type: array
- group:
- description: The group attribute of the resource
- associated with the status StatusReason.
- type: string
- kind:
- description: 'The kind attribute of the resource
- associated with the status StatusReason. On
- some operations may differ from the requested
- resource Kind. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- name:
- description: The name attribute of the resource
- associated with the status StatusReason (when
- there is a single name which can be described).
- type: string
- retryAfterSeconds:
- description: If specified, the time in seconds
- before the operation should be retried. Some
- errors may indicate the client must take an
- alternate action - for those errors this field
- may indicate how long to wait before taking
- the alternate action.
- format: int32
- type: integer
- uid:
- description: 'UID of the resource. (when there
- is a single resource which can be described).
- More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
- type: string
- type: object
- kind:
- description: 'Kind is a string value representing
- the REST resource this object represents. Servers
- may infer this from the endpoint the client submits
- requests to. Cannot be updated. In CamelCase.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- message:
- description: A human-readable description of the
- status of this operation.
- type: string
- metadata:
- description: ListMeta describes metadata that synthetic
- resources must have, including lists and various
- status objects. A resource may have only one of
- {ObjectMeta, ListMeta}.
- properties:
- continue:
- description: continue may be set if the user
- set a limit on the number of items returned,
- and indicates that the server has more data
- available. The value is opaque and may be
- used to issue another request to the endpoint
- that served this list to retrieve the next
- set of available objects. Continuing a consistent
- list may not be possible if the server configuration
- has changed or more than a few minutes have
- passed. The resourceVersion field returned
- when using this continue value will be identical
- to the value in the first response, unless
- you have received this token from an error
- message.
- type: string
- remainingItemCount:
- description: |-
- remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.
-
- This field is alpha and can be changed or removed without notice.
- format: int64
- type: integer
- resourceVersion:
- description: 'String that identifies the server''s
- internal version of this object that can be
- used by clients to determine when objects
- have changed. Value must be treated as opaque
- by clients and passed unmodified back to the
- server. Populated by the system. Read-only.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
- type: string
- selfLink:
- description: selfLink is a URL representing
- this object. Populated by the system. Read-only.
- type: string
- type: object
- reason:
- description: A machine-readable description of why
- this operation is in the "Failure" status. If
- this value is empty there is no information available.
- A Reason clarifies an HTTP status code but does
- not override it.
- type: string
- status:
- description: 'Status of the operation. One of: "Success"
- or "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
- type: string
- type: object
- required:
- - pending
- type: object
labels:
description: 'Map of string keys and values that can be
used to organize and categorize (scope and select) objects.
@@ -3908,10 +3935,14 @@ spec:
More info: http://kubernetes.io/docs/user-guide/labels'
type: object
managedFields:
- description: |-
- ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like "ci-cd". The set of fields is always in the version that the workflow used when modifying the object.
-
- This field is alpha and can be changed or removed without notice.
+ description: ManagedFields maps workflow-id and version
+ to the set of fields that are managed by that workflow.
+ This is mostly for internal housekeeping, and users typically
+ shouldn't need to set or understand this field. A workflow
+ can be the user's name, a controller's name, or the name
+ of a specific apply path like "ci-cd". The set of fields
+ is always in the version that the workflow used when modifying
+ the object.
items:
description: ManagedFieldsEntry is a workflow-id, a FieldSet
and the group version of the resource that the fieldset
@@ -3924,10 +3955,18 @@ spec:
field. It is necessary to track the version of a
field set because it cannot be automatically converted.
type: string
- fields:
- description: 'Fields stores a set of fields in a data
- structure like a Trie. To understand how this is
- used, see: https://github.com/kubernetes-sigs/structured-merge-diff'
+ fieldsType:
+ description: 'FieldsType is the discriminator for
+ the different fields format and version. There is
+ currently only one possible value: "FieldsV1"'
+ type: string
+ fieldsV1:
+ description: |-
+ FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.
+
+ Each key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.
+
+ The exact format is defined in sigs.k8s.io/structured-merge-diff
type: object
manager:
description: Manager is an identifier of the workflow
@@ -3991,7 +4030,7 @@ spec:
managing controller.
type: boolean
kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
@@ -4010,11 +4049,13 @@ spec:
description: |-
An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.
- Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+ Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
type: string
selfLink:
- description: SelfLink is a URL representing this object.
- Populated by the system. Read-only.
+ description: |-
+ SelfLink is a URL representing this object. Populated by the system. Read-only.
+
+ DEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.
type: string
uid:
description: |-
@@ -4210,6 +4251,10 @@ spec:
to ensure the Prometheus Operator knows what version of Thanos
is being configured.
type: string
+ listenLocal:
+ description: ListenLocal makes the Thanos sidecar listen on loopback,
+ so that it does not bind against the Pod IP.
+ type: boolean
objectStorageConfig:
description: SecretKeySelector selects a key of a Secret.
properties:
@@ -4398,7 +4443,7 @@ spec:
properties:
monitors:
description: 'Required: Monitors is a collection of Ceph monitors
- More info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
items:
type: string
type: array
@@ -4409,11 +4454,11 @@ spec:
readOnly:
description: 'Optional: Defaults to false (read/write). ReadOnly
here will force the ReadOnly setting in VolumeMounts. More
- info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
type: boolean
secretFile:
description: 'Optional: SecretFile is the path to key ring
- for User, default is /etc/ceph/user.secret More info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ for User, default is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
type: string
secretRef:
description: LocalObjectReference contains enough information
@@ -4426,7 +4471,7 @@ spec:
type: object
user:
description: 'Optional: User is the rados user name, default
- is admin More info: https://releases.k8s.io/HEAD/examples/volumes/cephfs/README.md#how-to-use-it'
+ is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
type: string
required:
- monitors
@@ -4441,12 +4486,12 @@ spec:
description: 'Filesystem type to mount. Must be a filesystem
type supported by the host operating system. Examples: "ext4",
"xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
- More info: https://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md'
+ More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
type: string
readOnly:
description: 'Optional: Defaults to false (read/write). ReadOnly
here will force the ReadOnly setting in VolumeMounts. More
- info: https://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md'
+ info: https://examples.k8s.io/mysql-cinder-pd/README.md'
type: boolean
secretRef:
description: LocalObjectReference contains enough information
@@ -4458,8 +4503,8 @@ spec:
type: string
type: object
volumeID:
- description: 'volume id used to identify the volume in cinder
- More info: https://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md'
+ description: 'volume id used to identify the volume in cinder.
+ More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
type: string
required:
- volumeID
@@ -4782,16 +4827,16 @@ spec:
properties:
endpoints:
description: 'EndpointsName is the endpoint name that details
- Glusterfs topology. More info: https://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod'
+ Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
type: string
path:
description: 'Path is the Glusterfs volume path. More info:
- https://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod'
+ https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
type: string
readOnly:
description: 'ReadOnly here will force the Glusterfs volume
to be mounted with read-only permissions. Defaults to false.
- More info: https://releases.k8s.io/HEAD/examples/volumes/glusterfs/README.md#create-a-pod'
+ More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
type: boolean
required:
- endpoints
@@ -5238,24 +5283,24 @@ spec:
https://kubernetes.io/docs/concepts/storage/volumes#rbd'
type: string
image:
- description: 'The rados image name. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
keyring:
description: 'Keyring is the path to key ring for RBDUser.
- Default is /etc/ceph/keyring. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
monitors:
- description: 'A collection of Ceph monitors. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ description: 'A collection of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
items:
type: string
type: array
pool:
description: 'The rados pool name. Default is rbd. More info:
- https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
readOnly:
description: 'ReadOnly here will force the ReadOnly setting
- in VolumeMounts. Defaults to false. More info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: boolean
secretRef:
description: LocalObjectReference contains enough information
@@ -5268,7 +5313,7 @@ spec:
type: object
user:
description: 'The rados user name. Default is admin. More
- info: https://releases.k8s.io/HEAD/examples/volumes/rbd/README.md#how-to-use-it'
+ info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
type: string
required:
- monitors
@@ -5459,7 +5504,7 @@ spec:
status:
description: 'PrometheusStatus is the most recent observed status of the
Prometheus cluster. Read-only. Not included when requesting from the apiserver,
- only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
+ only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status'
properties:
availableReplicas:
description: Total number of available pods (ready for at least minReadySeconds)
diff --git a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
index b48488510b2bbb0b5b63a510ae6824b11b5c736b..49ddbfb86c62498788e4f66e96b61cc7b9f693be 100644
--- a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
@@ -15,12 +15,12 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
description: ObjectMeta is metadata that all persisted resources must have,
@@ -70,186 +70,26 @@ spec:
If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header).
- Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency
+ Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
type: string
generation:
description: A sequence number representing a specific generation of
the desired state. Populated by the system. Read-only.
format: int64
type: integer
- initializers:
- description: Initializers tracks the progress of initialization.
- properties:
- pending:
- description: Pending is a list of initializers that must execute
- in order before this object is visible. When the last pending
- initializer is removed, and no failing result is set, the initializers
- struct will be set to nil and the object is considered as initialized
- and visible to all clients.
- items:
- description: Initializer is information about an initializer that
- has not yet completed.
- properties:
- name:
- description: name of the process that is responsible for initializing
- this object.
- type: string
- required:
- - name
- type: object
- type: array
- result:
- description: Status is a return value for calls that don't return
- other objects.
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this
- representation of an object. Servers should convert recognized
- schemas to the latest internal value, and may reject unrecognized
- values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
- type: string
- code:
- description: Suggested HTTP return code for this status, 0 if
- not set.
- format: int32
- type: integer
- details:
- description: StatusDetails is a set of additional properties
- that MAY be set by the server to provide additional information
- about a response. The Reason field of a Status object defines
- what attributes will be set. Clients must ignore fields that
- do not match the defined type of each attribute, and should
- assume that any attribute may be empty, invalid, or under
- defined.
- properties:
- causes:
- description: The Causes array includes more details associated
- with the StatusReason failure. Not all StatusReasons may
- provide detailed causes.
- items:
- description: StatusCause provides more information about
- an api.Status failure, including cases when multiple
- errors are encountered.
- properties:
- field:
- description: |-
- The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
- Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"
- type: string
- message:
- description: A human-readable description of the cause
- of the error. This field may be presented as-is
- to a reader.
- type: string
- reason:
- description: A machine-readable description of the
- cause of the error. If this value is empty there
- is no information available.
- type: string
- type: object
- type: array
- group:
- description: The group attribute of the resource associated
- with the status StatusReason.
- type: string
- kind:
- description: 'The kind attribute of the resource associated
- with the status StatusReason. On some operations may differ
- from the requested resource Kind. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- name:
- description: The name attribute of the resource associated
- with the status StatusReason (when there is a single name
- which can be described).
- type: string
- retryAfterSeconds:
- description: If specified, the time in seconds before the
- operation should be retried. Some errors may indicate
- the client must take an alternate action - for those errors
- this field may indicate how long to wait before taking
- the alternate action.
- format: int32
- type: integer
- uid:
- description: 'UID of the resource. (when there is a single
- resource which can be described). More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
- type: string
- type: object
- kind:
- description: 'Kind is a string value representing the REST resource
- this object represents. Servers may infer this from the endpoint
- the client submits requests to. Cannot be updated. In CamelCase.
- More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
- type: string
- message:
- description: A human-readable description of the status of this
- operation.
- type: string
- metadata:
- description: ListMeta describes metadata that synthetic resources
- must have, including lists and various status objects. A resource
- may have only one of {ObjectMeta, ListMeta}.
- properties:
- continue:
- description: continue may be set if the user set a limit
- on the number of items returned, and indicates that the
- server has more data available. The value is opaque and
- may be used to issue another request to the endpoint that
- served this list to retrieve the next set of available
- objects. Continuing a consistent list may not be possible
- if the server configuration has changed or more than a
- few minutes have passed. The resourceVersion field returned
- when using this continue value will be identical to the
- value in the first response, unless you have received
- this token from an error message.
- type: string
- remainingItemCount:
- description: |-
- remainingItemCount is the number of subsequent items in the list which are not included in this list response. If the list request contained label or field selectors, then the number of remaining items is unknown and the field will be left unset and omitted during serialization. If the list is complete (either because it is not chunking or because this is the last chunk), then there are no more remaining items and this field will be left unset and omitted during serialization. Servers older than v1.15 do not set this field. The intended use of the remainingItemCount is *estimating* the size of a collection. Clients should not rely on the remainingItemCount to be set or to be exact.
-
- This field is alpha and can be changed or removed without notice.
- format: int64
- type: integer
- resourceVersion:
- description: 'String that identifies the server''s internal
- version of this object that can be used by clients to
- determine when objects have changed. Value must be treated
- as opaque by clients and passed unmodified back to the
- server. Populated by the system. Read-only. More info:
- https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency'
- type: string
- selfLink:
- description: selfLink is a URL representing this object.
- Populated by the system. Read-only.
- type: string
- type: object
- reason:
- description: A machine-readable description of why this operation
- is in the "Failure" status. If this value is empty there is
- no information available. A Reason clarifies an HTTP status
- code but does not override it.
- type: string
- status:
- description: 'Status of the operation. One of: "Success" or
- "Failure". More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status'
- type: string
- type: object
- required:
- - pending
- type: object
labels:
description: 'Map of string keys and values that can be used to organize
and categorize (scope and select) objects. May match selectors of
replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels'
type: object
managedFields:
- description: |-
- ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like "ci-cd". The set of fields is always in the version that the workflow used when modifying the object.
-
- This field is alpha and can be changed or removed without notice.
+ description: ManagedFields maps workflow-id and version to the set of
+ fields that are managed by that workflow. This is mostly for internal
+ housekeeping, and users typically shouldn't need to set or understand
+ this field. A workflow can be the user's name, a controller's name,
+ or the name of a specific apply path like "ci-cd". The set of fields
+ is always in the version that the workflow used when modifying the
+ object.
items:
description: ManagedFieldsEntry is a workflow-id, a FieldSet and the
group version of the resource that the fieldset applies to.
@@ -261,9 +101,18 @@ spec:
the version of a field set because it cannot be automatically
converted.
type: string
- fields:
- description: 'Fields stores a set of fields in a data structure
- like a Trie. To understand how this is used, see: https://github.com/kubernetes-sigs/structured-merge-diff'
+ fieldsType:
+ description: 'FieldsType is the discriminator for the different
+ fields format and version. There is currently only one possible
+ value: "FieldsV1"'
+ type: string
+ fieldsV1:
+ description: |-
+ FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.
+
+ Each key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.
+
+ The exact format is defined in sigs.k8s.io/structured-merge-diff
type: object
manager:
description: Manager is an identifier of the workflow managing
@@ -321,7 +170,7 @@ spec:
description: If true, this reference points to the managing controller.
type: boolean
kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
@@ -340,11 +189,13 @@ spec:
description: |-
An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.
- Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
+ Populated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
type: string
selfLink:
- description: SelfLink is a URL representing this object. Populated by
- the system. Read-only.
+ description: |-
+ SelfLink is a URL representing this object. Populated by the system. Read-only.
+
+ DEPRECATED Kubernetes will stop propagating this field in 1.20 release and the field is planned to be removed in 1.21 release.
type: string
uid:
description: |-
diff --git a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
index 75ccc6735e0991b8dccb85f203d4bb50a68cb516..5283e87d5188dabd91ba33549fb9503f315573d4 100644
--- a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
@@ -15,12 +15,12 @@ spec:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
spec:
description: ServiceMonitorSpec contains specification parameters for a
@@ -74,10 +74,31 @@ spec:
bearerTokenFile:
description: File to read bearer token for scraping targets.
type: string
+ bearerTokenSecret:
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be
+ defined
+ type: boolean
+ required:
+ - key
+ type: object
honorLabels:
description: HonorLabels chooses the metric's labels on collisions
with target labels.
type: boolean
+ honorTimestamps:
+ description: HonorTimestamps controls whether Prometheus respects
+ the timestamps present in scraped data.
+ type: boolean
interval:
description: Interval at which metrics should be scraped
type: string
@@ -199,18 +220,40 @@ spec:
tlsConfig:
description: TLSConfig specifies TLS configuration parameters.
properties:
+ ca: {}
caFile:
- description: The CA cert to use for the targets.
+ description: Path to the CA cert in the Prometheus container
+ to use for the targets.
type: string
+ cert: {}
certFile:
- description: The client cert file for the targets.
+ description: Path to the client cert file in the Prometheus
+ container for the targets.
type: string
insecureSkipVerify:
description: Disable target certificate validation.
type: boolean
keyFile:
- description: The client key file for the targets.
+ description: Path to the client key file in the Prometheus
+ container for the targets.
type: string
+ keySecret:
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must
+ be defined
+ type: boolean
+ required:
+ - key
+ type: object
serverName:
description: Used to verify the hostname for the targets.
type: string
diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml
index 28379ea309e7c7efdfa5fdb7d75b3149c224472c..bbb37a0f1ed7f2aa5a4fd4144c4c1023cf792f13 100644
--- a/manifests/setup/prometheus-operator-clusterRole.yaml
+++ b/manifests/setup/prometheus-operator-clusterRole.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
index 41113ff6ce633136df4b239a4163b2c619742701..fc8b1b45e009d19b52fa7d75f6c6963625bf591e 100644
--- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
+++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml
index b95de48916ca66303073bf938cb210a7a19aa422..533c20cd869790edaa5bd09b47bf484d0f9244e8 100644
--- a/manifests/setup/prometheus-operator-deployment.yaml
+++ b/manifests/setup/prometheus-operator-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -18,15 +18,15 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.33.0
- image: quay.io/coreos/prometheus-operator:v0.33.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.34.0
+ image: quay.io/coreos/prometheus-operator:v0.34.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml
index 68f06c991edb8034cc1a601886a17deb94faa964..7bd218369c256ffd71c0215b00bfae73b28c0508 100644
--- a/manifests/setup/prometheus-operator-service.yaml
+++ b/manifests/setup/prometheus-operator-service.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml
index d74f8ec2bd462cc184b2eccfc1ab5709b4f78ca9..d100bb15327f4d165ff3f9920abd4f8dc3ea52c4 100644
--- a/manifests/setup/prometheus-operator-serviceAccount.yaml
+++ b/manifests/setup/prometheus-operator-serviceAccount.yaml
@@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.33.0
+ app.kubernetes.io/version: v0.34.0
name: prometheus-operator
namespace: monitoring