diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index fe0ea1455b3b877a57d9e6eba0cf72a0f7cdfee8..59181d962ce4e9daa14c37786b225bf1b9e25c1c 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "69279532f46cb7491bb60a588be534100fdc058d",
+ "version": "96a9fd0a1e2a2887ebcf3b8eba90d8f0a881e77b",
"sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU="
},
{
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
- "version": "88bc47441f75b5956023be0b1f79c371420cdcdd",
+ "version": "9d11c9153fe6ce8251c7ed1be9d36b6722a36e6d",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "264a5c2078c5930af57fe2d107eff83ab63553af",
+ "version": "b46355107c024e0aa4932adadd939294c3b8260d",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
@@ -58,8 +58,8 @@
"subdir": ""
}
},
- "version": "fd913499e956da06f520c3784c59573ee552b152",
- "sum": "0NaFSDIXJnFGN7vJPDQkxpVXWfZJBns1xwCPnHLvbj8="
+ "version": "3346c8cbcc1660caeddf2ffc9443dabe583e1a35",
+ "sum": "3d7EmbTZ5Vyd93nWG7Hayfzz9Z6aXwo+wxRqvKuuPH8="
},
{
"source": {
@@ -68,7 +68,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "fd913499e956da06f520c3784c59573ee552b152",
+ "version": "3346c8cbcc1660caeddf2ffc9443dabe583e1a35",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "f629b2579de2ea6d1560ec3b284143dd603203f6",
+ "version": "41eea36f69efd9824836089aae67d308111f4e01",
"sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "f629b2579de2ea6d1560ec3b284143dd603203f6",
+ "version": "41eea36f69efd9824836089aae67d308111f4e01",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "2421947e35a4491f94f62deaf149ea42cfc72e79",
+ "version": "56e89dfa0bac7a6b38a962059127992e64f69301",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "2421947e35a4491f94f62deaf149ea42cfc72e79",
- "sum": "yjdwZ+5UXL42EavJleAJmd8Ou6MSDfExvlKAxFCxXVE="
+ "version": "56e89dfa0bac7a6b38a962059127992e64f69301",
+ "sum": "9tMXOZtJJa+LebG6uR9ItdwWh5XrgSzNt9NhXyC8uyQ="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "48a99764a1fc9279fc828de83e7a03ae2219abc7",
+ "version": "c0a7b75c9cfb0772bdf5ec7362775f5f7798a3a0",
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
"name": "alertmanager"
},
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "749b1a199e29b079cc4648e2fc42e334aaf9fdca",
+ "version": "996563f9729588660d5d32826c46b0d7169b1334",
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "a961062c37f1675d5925d8b74ddda0a6322ed82d",
+ "version": "2ce94ac19673a3f7faf164e9e078a79d4d52b767",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"name": "prometheus"
},
@@ -151,8 +151,8 @@
"subdir": "mixin"
}
},
- "version": "0665dd999dc663fcf7fe21dc3e70408f86436918",
- "sum": "1Y1cPIeoPg2nCAEhKPCt8bAGuwuOP2eZ3kVF432mlMA=",
+ "version": "cc178554365234a39d001dd2d22d5f7ebdb85f2b",
+ "sum": "RbqWknYtfJHwMBlM+gAjqfmvV5wqn5AFV/IGcHGadM0=",
"name": "thanos-mixin"
},
{
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index 8d876ac6fcea985bbcbdfcc1e565640ca7267f87..8cff151c0f025516bf70612d026fba0ea8132c8c 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -1358,6 +1358,16 @@ spec:
labels:
workload_type: statefulset
record: namespace_workload_pod:kube_pod_owner:relabel
+ - expr: |
+ max by (cluster, namespace, workload, pod) (
+ label_replace(
+ kube_pod_owner{job="kube-state-metrics", owner_kind="Job"},
+ "workload", "$1", "owner_name", "(.*)"
+ )
+ )
+ labels:
+ workload_type: job
+ record: namespace_workload_pod:kube_pod_owner:relabel
- name: kube-scheduler.rules
rules:
- expr: |
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 97975e135aeda6b2e01618eec227c4f85928ed44..fc2a190f267cdcb0540b36f2376ea2ef70af0485 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -1858,6 +1858,348 @@ spec:
type: string
type: object
type: array
+ snsConfigs:
+ description: List of SNS configurations
+ items:
+ description: SNSConfig configures notifications via AWS SNS.
+ See https://prometheus.io/docs/alerting/latest/configuration/#sns_configs
+ properties:
+ apiURL:
+ description: The SNS API URL i.e. https://sns.us-east-2.amazonaws.com.
+ If not specified, the SNS API URL from the SNS SDK will
+ be used.
+ type: string
+ attributes:
+ additionalProperties:
+ type: string
+ description: SNS message attributes.
+ type: object
+ httpConfig:
+ description: HTTP client configuration.
+ properties:
+ authorization:
+ description: Authorization header configuration for
+ the client. This is mutually exclusive with BasicAuth
+ and is only available starting from Alertmanager
+ v0.22+.
+ properties:
+ credentials:
+ description: The secret's key that contains the
+ credentials of the request
+ 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
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or
+ its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type:
+ description: Set the authentication type. Defaults
+ to Bearer, Basic will cause an error
+ type: string
+ type: object
+ basicAuth:
+ description: BasicAuth for the client. This is mutually
+ exclusive with Authorization. If both are defined,
+ BasicAuth takes precedence.
+ properties:
+ password:
+ description: The secret in the service monitor
+ namespace that contains the password for authentication.
+ 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
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or
+ its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ username:
+ description: The secret in the service monitor
+ namespace that contains the username for authentication.
+ 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
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or
+ its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ bearerTokenSecret:
+ description: The secret's key that contains the bearer
+ token to be used by the client for authentication.
+ The secret needs to be in the same namespace as
+ the AlertmanagerConfig object and accessible by
+ the Prometheus Operator.
+ 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
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its
+ key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ proxyURL:
+ description: Optional proxy URL.
+ type: string
+ tlsConfig:
+ description: TLS configuration for the client.
+ properties:
+ ca:
+ description: Struct containing the CA cert to
+ use for the targets.
+ properties:
+ configMap:
+ description: ConfigMap containing data to
+ use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More
+ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap
+ or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ secret:
+ description: Secret containing data to use
+ for the targets.
+ properties:
+ key:
+ description: The key of the secret to
+ select from. Must be a valid secret
+ key.
+ type: string
+ name:
+ description: 'Name of the referent. More
+ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret
+ or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ cert:
+ description: Struct containing the client cert
+ file for the targets.
+ properties:
+ configMap:
+ description: ConfigMap containing data to
+ use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More
+ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap
+ or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ secret:
+ description: Secret containing data to use
+ for the targets.
+ properties:
+ key:
+ description: The key of the secret to
+ select from. Must be a valid secret
+ key.
+ type: string
+ name:
+ description: 'Name of the referent. More
+ info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret
+ or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key
+ file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select
+ from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info:
+ https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion,
+ kind, uid?'
+ 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
+ type: object
+ type: object
+ message:
+ description: The message content of the SNS notification.
+ type: string
+ phoneNumber:
+ description: Phone number if message is delivered via
+ SMS in E.164 format. If you don't specify this value,
+ you must specify a value for the TopicARN or TargetARN.
+ type: string
+ sendResolved:
+ description: Whether or not to notify about resolved alerts.
+ type: boolean
+ sigv4:
+ description: Configures AWS's Signature Verification 4
+ signing process to sign requests.
+ properties:
+ accessKey:
+ description: AccessKey is the AWS API key. If blank,
+ the environment variable `AWS_ACCESS_KEY_ID` is
+ used.
+ 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
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its
+ key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ profile:
+ description: Profile is the named AWS profile used
+ to authenticate.
+ type: string
+ region:
+ description: Region is the AWS region. If blank, the
+ region from the default credentials chain used.
+ type: string
+ roleArn:
+ description: RoleArn is the named AWS profile used
+ to authenticate.
+ type: string
+ secretKey:
+ description: SecretKey is the AWS API secret. If blank,
+ the environment variable `AWS_SECRET_ACCESS_KEY`
+ is used.
+ 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
+ TODO: Add other useful fields. apiVersion, kind,
+ uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its
+ key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ subject:
+ description: Subject line when the message is delivered
+ to email endpoints.
+ type: string
+ targetARN:
+ description: The mobile platform endpoint ARN if message
+ is delivered via mobile notifications. If you don't
+ specify this value, you must specify a value for the
+ topic_arn or PhoneNumber.
+ type: string
+ topicARN:
+ description: SNS topic ARN, i.e. arn:aws:sns:us-east-2:698519295917:My-Topic
+ If you don't specify this value, you must specify a
+ value for the PhoneNumber or TargetARN.
+ type: string
+ type: object
+ type: array
victoropsConfigs:
description: List of VictorOps configurations.
items:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 20c244848cc155138a35254877b3a20be177953f..a38b2c1fe11d57c105be51678eab42efb1b97ab8 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -188,8 +188,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source
@@ -338,8 +347,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index ef63c8f00f5f0e53891204f9991ce29bf34ede8b..c6e6d394e275b5c391ae38acd474d623d7bb94a6 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -158,8 +158,17 @@ spec:
of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching. Default
is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source label
@@ -344,8 +353,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source
@@ -446,8 +464,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index e90e05ae7371f10fe18801132898fb236a4cc968..ab701b5b533d65bb9e236e3735c807daad2cdc44 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -5071,8 +5071,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 26b3003abac66464bd7f2bf15592457e562a4137..f61454c098028a74a2f7b16719734d5bf621b152 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -157,8 +157,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source
@@ -307,8 +316,17 @@ spec:
configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
action:
+ default: replace
description: Action to perform based on regex matching.
Default is 'replace'
+ enum:
+ - replace
+ - keep
+ - drop
+ - hashmod
+ - labelmap
+ - labeldrop
+ - labelkeep
type: string
modulus:
description: Modulus to take of the hash of the source