Skip to content

Commit d44b57f

Browse files
rexagodrexagod
committed
chore: make generate
Signed-off-by: Pranshu Srivastava <[email protected]>
1 parent 39c3097 commit d44b57f

12 files changed

+508
-20
lines changed

‎manifests/grafana-dashboardDefinitions.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3158,7 +3158,6 @@ items:
31583158
}
31593159
],
31603160
"schemaVersion": 30,
3161-
"style": "dark",
31623161
"tags": [
31633162

31643163
],
@@ -22245,7 +22244,7 @@ items:
2224522244
}
2224622245
},
2224722246
"min": 0,
22248-
"unit": "ms"
22247+
"unit": "short"
2224922248
}
2225022249
},
2225122250
"gridPos": {
@@ -22663,7 +22662,8 @@ items:
2266322662
]
2266422663
},
2266522664
"timezone": "utc",
22666-
"title": "Prometheus / Overview"
22665+
"title": "Prometheus / Overview",
22666+
"uid": "9fa0d141-d019-4ad7-8bc5-42196ee308bd"
2266722667
}
2266822668
kind: ConfigMap
2266922669
metadata:

‎manifests/grafana-prometheusRule.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ spec:
1919
message: '{{ $labels.namespace }}/{{ $labels.job }}/{{ $labels.handler }} is experiencing {{ $value | humanize }}% errors'
2020
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/grafana/grafanarequestsfailing
2121
expr: |
22-
100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
23-
/ ignoring (status_code)
22+
100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
23+
/
2424
sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
2525
> 50
2626
for: 5m

‎manifests/kubernetesControlPlane-prometheusRule.yaml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ spec:
122122
unless
123123
kube_statefulset_status_update_revision{job="kube-state-metrics"}
124124
)
125-
*
125+
* on(namespace, statefulset, job, cluster)
126126
(
127127
kube_statefulset_replicas{job="kube-state-metrics"}
128128
!=
129129
kube_statefulset_status_replicas_updated{job="kube-state-metrics"}
130130
)
131-
) and (
131+
) and on(namespace, statefulset, job, cluster) (
132132
changes(kube_statefulset_status_replicas_updated{job="kube-state-metrics"}[5m])
133133
==
134134
0
@@ -1550,18 +1550,15 @@ spec:
15501550
record: cluster:node_cpu:ratio_rate5m
15511551
- name: kubelet.rules
15521552
rules:
1553-
- expr: |
1554-
histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"})
1553+
- expr: "histogram_quantile(\n 0.99, \n sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job=\"kubelet\", metrics_path=\"/metrics\"}[5m])) by (cluster, instance, le) \n * on(cluster, instance) group_left (node) \n max by (cluster, instance, node) (kubelet_node_name{job=\"kubelet\", metrics_path=\"/metrics\"})\n)\n"
15551554
labels:
15561555
quantile: "0.99"
15571556
record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile
1558-
- expr: |
1559-
histogram_quantile(0.9, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"})
1557+
- expr: "histogram_quantile(\n 0.9, \n sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job=\"kubelet\", metrics_path=\"/metrics\"}[5m])) by (cluster, instance, le) \n * on(cluster, instance) group_left (node) \n max by (cluster, instance, node) (kubelet_node_name{job=\"kubelet\", metrics_path=\"/metrics\"})\n)\n"
15601558
labels:
15611559
quantile: "0.9"
15621560
record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile
1563-
- expr: |
1564-
histogram_quantile(0.5, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"})
1561+
- expr: "histogram_quantile(\n 0.5, \n sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job=\"kubelet\", metrics_path=\"/metrics\"}[5m])) by (cluster, instance, le) \n * on(cluster, instance) group_left (node) \n max by (cluster, instance, node) (kubelet_node_name{job=\"kubelet\", metrics_path=\"/metrics\"})\n)\n"
15651562
labels:
15661563
quantile: "0.5"
15671564
record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile

‎manifests/prometheusOperator-clusterRole.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ rules:
2626
- thanosrulers/status
2727
- scrapeconfigs
2828
- servicemonitors
29+
- servicemonitors/status
2930
- podmonitors
3031
- probes
3132
- prometheusrules

‎manifests/setup/0alertmanagerCustomResourceDefinition.yaml‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ spec:
991991
The default value is `OnNamespace`.
992992
enum:
993993
- OnNamespace
994+
- OnNamespaceExceptForAlertmanagerNamespace
994995
- None
995996
type: string
996997
type: object
@@ -1719,6 +1720,17 @@ spec:
17191720
type: string
17201721
type: object
17211722
type: object
1723+
jira:
1724+
description: The default configuration for Jira.
1725+
properties:
1726+
apiURL:
1727+
description: |-
1728+
The default Jira API URL.
1729+
1730+
It requires Alertmanager >= v0.28.0.
1731+
pattern: ^(http|https)://.+$
1732+
type: string
1733+
type: object
17221734
opsGenieApiKey:
17231735
description: The default OpsGenie API Key.
17241736
properties:
@@ -1773,6 +1785,67 @@ spec:
17731785
This has no impact on alerts from Prometheus, as they always include EndsAt.
17741786
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
17751787
type: string
1788+
rocketChat:
1789+
description: The default configuration for Rocket Chat.
1790+
properties:
1791+
apiURL:
1792+
description: |-
1793+
The default Rocket Chat API URL.
1794+
1795+
It requires Alertmanager >= v0.28.0.
1796+
pattern: ^(http|https)://.+$
1797+
type: string
1798+
token:
1799+
description: |-
1800+
The default Rocket Chat token.
1801+
1802+
It requires Alertmanager >= v0.28.0.
1803+
properties:
1804+
key:
1805+
description: The key of the secret to select from. Must be a valid secret key.
1806+
type: string
1807+
name:
1808+
default: ""
1809+
description: |-
1810+
Name of the referent.
1811+
This field is effectively required, but due to backwards compatibility is
1812+
allowed to be empty. Instances of this type with an empty value here are
1813+
almost certainly wrong.
1814+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1815+
type: string
1816+
optional:
1817+
description: Specify whether the Secret or its key must be defined
1818+
type: boolean
1819+
required:
1820+
- key
1821+
type: object
1822+
x-kubernetes-map-type: atomic
1823+
tokenID:
1824+
description: |-
1825+
The default Rocket Chat Token ID.
1826+
1827+
It requires Alertmanager >= v0.28.0.
1828+
properties:
1829+
key:
1830+
description: The key of the secret to select from. Must be a valid secret key.
1831+
type: string
1832+
name:
1833+
default: ""
1834+
description: |-
1835+
Name of the referent.
1836+
This field is effectively required, but due to backwards compatibility is
1837+
allowed to be empty. Instances of this type with an empty value here are
1838+
almost certainly wrong.
1839+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1840+
type: string
1841+
optional:
1842+
description: Specify whether the Secret or its key must be defined
1843+
type: boolean
1844+
required:
1845+
- key
1846+
type: object
1847+
x-kubernetes-map-type: atomic
1848+
type: object
17761849
slackApiUrl:
17771850
description: The default Slack API URL.
17781851
properties:
@@ -2025,6 +2098,64 @@ spec:
20252098
type: string
20262099
type: object
20272100
type: object
2101+
telegram:
2102+
description: The default Telegram config
2103+
properties:
2104+
apiURL:
2105+
description: |-
2106+
The default Telegram API URL.
2107+
2108+
It requires Alertmanager >= v0.24.0.
2109+
pattern: ^(http|https)://.+$
2110+
type: string
2111+
type: object
2112+
webex:
2113+
description: The default configuration for Jira.
2114+
properties:
2115+
apiURL:
2116+
description: |-
2117+
The default Webex API URL.
2118+
2119+
It requires Alertmanager >= v0.25.0.
2120+
pattern: ^(http|https)://.+$
2121+
type: string
2122+
type: object
2123+
wechat:
2124+
description: The default WeChat Config
2125+
properties:
2126+
apiCorpID:
2127+
description: The default WeChat API Corporate ID.
2128+
minLength: 1
2129+
type: string
2130+
apiSecret:
2131+
description: The default WeChat API Secret.
2132+
properties:
2133+
key:
2134+
description: The key of the secret to select from. Must be a valid secret key.
2135+
type: string
2136+
name:
2137+
default: ""
2138+
description: |-
2139+
Name of the referent.
2140+
This field is effectively required, but due to backwards compatibility is
2141+
allowed to be empty. Instances of this type with an empty value here are
2142+
almost certainly wrong.
2143+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2144+
type: string
2145+
optional:
2146+
description: Specify whether the Secret or its key must be defined
2147+
type: boolean
2148+
required:
2149+
- key
2150+
type: object
2151+
x-kubernetes-map-type: atomic
2152+
apiURL:
2153+
description: |-
2154+
The default WeChat API URL.
2155+
The default value is "https://qyapi.weixin.qq.com/cgi-bin/"
2156+
pattern: ^(http|https)://.+$
2157+
type: string
2158+
type: object
20282159
type: object
20292160
name:
20302161
description: |-

‎manifests/setup/0podmonitorCustomResourceDefinition.yaml‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,14 @@ spec:
416416
type: string
417417
type: object
418418
type: array
419+
noProxy:
420+
description: |-
421+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
422+
that should be excluded from proxying. IP and domain names can
423+
contain port numbers.
424+
425+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
426+
type: string
419427
oauth2:
420428
description: |-
421429
`oauth2` configures the OAuth2 settings to use when scraping the target.
@@ -746,10 +754,47 @@ spec:
746754
maximum: 65535
747755
minimum: 1
748756
type: integer
749-
proxyUrl:
757+
proxyConnectHeader:
758+
additionalProperties:
759+
items:
760+
description: SecretKeySelector selects a key of a Secret.
761+
properties:
762+
key:
763+
description: The key of the secret to select from. Must be a valid secret key.
764+
type: string
765+
name:
766+
default: ""
767+
description: |-
768+
Name of the referent.
769+
This field is effectively required, but due to backwards compatibility is
770+
allowed to be empty. Instances of this type with an empty value here are
771+
almost certainly wrong.
772+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
773+
type: string
774+
optional:
775+
description: Specify whether the Secret or its key must be defined
776+
type: boolean
777+
required:
778+
- key
779+
type: object
780+
x-kubernetes-map-type: atomic
781+
type: array
782+
description: |-
783+
ProxyConnectHeader optionally specifies headers to send to
784+
proxies during CONNECT requests.
785+
786+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
787+
type: object
788+
x-kubernetes-map-type: atomic
789+
proxyFromEnvironment:
750790
description: |-
751-
`proxyURL` configures the HTTP Proxy URL (e.g.
752-
"http://proxyserver:2195") to go through when scraping the target.
791+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
792+
793+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
794+
type: boolean
795+
proxyUrl:
796+
description: '`proxyURL` defines the HTTP proxy server to use.'
797+
pattern: ^(http|https|socks5)://.+$
753798
type: string
754799
relabelings:
755800
description: |-

‎manifests/setup/0probeCustomResourceDefinition.yaml‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,14 +628,61 @@ spec:
628628
Specification for the prober to use for probing targets.
629629
The prober.URL parameter is required. Targets cannot be probed if left empty.
630630
properties:
631+
noProxy:
632+
description: |-
633+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
634+
that should be excluded from proxying. IP and domain names can
635+
contain port numbers.
636+
637+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
638+
type: string
631639
path:
632640
default: /probe
633641
description: |-
634642
Path to collect metrics from.
635643
Defaults to `/probe`.
636644
type: string
645+
proxyConnectHeader:
646+
additionalProperties:
647+
items:
648+
description: SecretKeySelector selects a key of a Secret.
649+
properties:
650+
key:
651+
description: The key of the secret to select from. Must be a valid secret key.
652+
type: string
653+
name:
654+
default: ""
655+
description: |-
656+
Name of the referent.
657+
This field is effectively required, but due to backwards compatibility is
658+
allowed to be empty. Instances of this type with an empty value here are
659+
almost certainly wrong.
660+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
661+
type: string
662+
optional:
663+
description: Specify whether the Secret or its key must be defined
664+
type: boolean
665+
required:
666+
- key
667+
type: object
668+
x-kubernetes-map-type: atomic
669+
type: array
670+
description: |-
671+
ProxyConnectHeader optionally specifies headers to send to
672+
proxies during CONNECT requests.
673+
674+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
675+
type: object
676+
x-kubernetes-map-type: atomic
677+
proxyFromEnvironment:
678+
description: |-
679+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
680+
681+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
682+
type: boolean
637683
proxyUrl:
638-
description: Optional ProxyURL.
684+
description: '`proxyURL` defines the HTTP proxy server to use.'
685+
pattern: ^(http|https|socks5)://.+$
639686
type: string
640687
scheme:
641688
description: |-

0 commit comments

Comments
 (0)