mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-24 13:41:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1364 from prometheus-operator/automated-updates-main

Browse Source 
[bot] [main] Automated version update
This commit is contained in:
Damien Grisonnet 2021-09-07 09:39:21 +02:00 committed by GitHub
commit bc82275a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 230 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jsonnetfile.lock.json
View File

@ -8,8 +8,8 @@
"subdir": "grafana"
}
},
"version": "90f38916f1f8a310a715d18e36f787f84df4ddf5",
"sum": "0kZ1pnuIirDtbg6F9at5+NQOwKNONIGEPq0eECzvRkI="
"version": "c3b14b24b83cfe9abf1064649d19e2d679f033fb",
"sum": "YrE4DNQsWgYWs6h0j/FjQETt8xDXdYdsslb1WK7xQEk="
},
{
"source": {
@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "ef81030105b5519b49de6d13218c32532d932db6",
"version": "91a5089d17f786d244ce49704774a29faf4e4ed2",
"sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
},
{
@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "a465b976c63ec4ef25ffb6426d10c7d595c51877",
"version": "d111b6d8e07f8dde1dfe7e688f44242e4aa4f734",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
},
{
@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "a465b976c63ec4ef25ffb6426d10c7d595c51877",
"version": "d111b6d8e07f8dde1dfe7e688f44242e4aa4f734",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "07fcff9170ceffe82fd1336e518a51710d2994c4",
"version": "5fe12e2dbe118a5a3604e3ce2531a14f22848c5f",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "07fcff9170ceffe82fd1336e518a51710d2994c4",
"sum": "8sW09DSYBOS3RCvnBtC850sujaFNwoJoclW4AQxUw9Q="
"version": "5fe12e2dbe118a5a3604e3ce2531a14f22848c5f",
"sum": "FUGl2HPBXDJQ3W9WeHPDBvATBHODKRAsyTP0G5PtviM="
},
{
"source": {
@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "d6e758ad3792ce6a78032f6d2ae706f367422e35",
"version": "8da517524a878ee8933ed12376bb997ebaba3a09",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager"
},
@ -120,8 +120,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "b6215e649cdfc0398ca98df8e63f3773f1725840",
"sum": "MmxGhE2PJ1a52mk2x7vDpMT2at4Jglbud/rK74CB5i0="
"version": "6f1286b314fdf16155928e92d436be0a107ce9c6",
"sum": "OFNs9Te1QMqSscXqNqMv0zwaJoJxaEg7NyQVNyT4VeA="
},
{
"source": {
@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "a2665a9f7384cd34052ede077c036c27fa9a8ce5",
"version": "c244fe27a323a69d062b5c2c40a52fd15a831b0f",
"sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
"name": "prometheus"
},
@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
"version": "fdfc0776d0c3544a29e1bad5cc49ef971c5b73ef",
"version": "bd134d7a823708fa135e7a6931e76f581be5f879",
"sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=",
"name": "thanos-mixin"
},

18
manifests/grafana-dashboardDatasources.yaml
View File

@ -1,6 +1,4 @@
apiVersion: v1
data:
datasources.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
kind: Secret
metadata:
labels:
@ -10,4 +8,20 @@ metadata:
app.kubernetes.io/version: 8.1.2
name: grafana-datasources
namespace: monitoring
stringData:
datasources.yaml: |-
{
"apiVersion": 1,
"datasources": [
{
"access": "proxy",
"editable": false,
"name": "prometheus",
"orgId": 1,
"type": "prometheus",
"url": "http://prometheus-k8s.monitoring.svc:9090",
"version": 1
}
]
}
type: Opaque

1
manifests/grafana-dashboardSources.yaml
View File

@ -6,6 +6,7 @@ data:
"providers": [
{
"folder": "Default",
"folderUid": "",
"name": "0",
"options": {
"path": "/grafana-dashboard-definitions/0"

10
manifests/grafana-deployment.yaml
View File

@ -18,7 +18,9 @@ spec:
template:
metadata:
annotations:
checksum/grafana-datasources: eb633dbe89057f52cf1243153e640b1d
checksum/grafana-config: 9e92fcf7cec54ae70af0deab79e283d0
checksum/grafana-dashboardproviders: e8fc7f6247c9dec844098ae0d4b24d26
checksum/grafana-datasources: ea73b70ba8595400d1ed21af33684ff9
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
@ -122,6 +124,9 @@ spec:
- mountPath: /grafana-dashboard-definitions/0/workload-total
name: grafana-dashboard-workload-total
readOnly: false
- mountPath: /etc/grafana
name: grafana-config
readOnly: false
nodeSelector:
kubernetes.io/os: linux
securityContext:
@ -207,3 +212,6 @@ spec:
- configMap:
name: grafana-dashboard-workload-total
name: grafana-dashboard-workload-total
- name: grafana-config
secret:
secretName: grafana-config

6
manifests/node-exporter-prometheusRule.yaml
View File

@ -250,10 +250,8 @@ spec:
- name: node-exporter.rules
rules:
- expr: |
count without (cpu) (
count without (mode) (
node_cpu_seconds_total{job="node-exporter"}
)
count without (cpu, mode) (
node_cpu_seconds_total{job="node-exporter",mode="idle"}
)
record: instance:node_num_cpu:sum
- expr: |

168
manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml
View File

@ -314,8 +314,30 @@ spec:
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.
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.
@ -545,8 +567,30 @@ spec:
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.
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.
@ -746,8 +790,30 @@ spec:
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.
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.
@ -1039,8 +1105,30 @@ spec:
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.
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.
@ -1262,8 +1350,30 @@ spec:
httpConfig:
description: The HTTP client's 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.
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.
@ -1433,8 +1543,30 @@ spec:
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.
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.
@ -1638,8 +1770,30 @@ spec:
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.
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.

28
manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
View File

@ -3738,6 +3738,34 @@ spec:
version:
description: Version describes the version of Thanos to use.
type: string
volumeMounts:
description: VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the thanos-sidecar container.
items:
description: VolumeMount describes a mounting of a Volume within a container.
properties:
mountPath:
description: Path within the container at which the volume should be mounted. Must not contain ':'.
type: string
mountPropagation:
description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10.
type: string
name:
description: This must match the Name of a Volume.
type: string
readOnly:
description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.
type: boolean
subPath:
description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root).
type: string
subPathExpr:
description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive.
type: string
required:
- mountPath
- name
type: object
type: array
type: object
tolerations:
description: If specified, the pod's tolerations.