easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #412 from pgier/prometheus-operator-v0.36.0

Browse Source 
Prometheus operator v0.36.0
This commit is contained in:
Paul Gier
2020-02-11 11:04:23 -06:00
committed by GitHub
parent 0ed3f70014 6a2cc72573
commit 8b0b0bc514
15 changed files with 3899 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/jsonnetfile.json
View File

@@ -38,7 +38,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "release-0.35"
"version": "release-0.36"
},
{
"name": "etcd-mixin",

5
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@@ -45,6 +45,11 @@ local configMapList = k3.core.v1.configMapList;
preserveUnknownFields: null,
}),
},
'0thanosrulerCustomResourceDefinition'+: {
spec: std.mergePatch(super.spec, {
preserveUnknownFields: null,
}),
},
},
grafana+:: {
dashboardDefinitions: configMapList.new(super.dashboardDefinitions),

16
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
"version": "f6c7d5c46a2a4470545d73f7833e57821b124714",
"version": "e5c90ebf90cb3692c26240d19406de47414a2b38",
"sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
},
{
@@ -94,8 +94,8 @@
"subdir": ""
}
},
"version": "92309e9c7a7637c38a12c0964e62a7aeccaf49ae",
"sum": "g0ESmFe+O83pc45hgvQMHJFZV4ZoUSnRrYKKPkqaC7g="
"version": "b2d7f762bd22be3ba5e7d54a1fcecfe1092f214b",
"sum": "NqrJQnQnRDzkCbrHg7L1zX8XPAzfoE4DS2XBEj6WC8g="
},
{
"name": "node-mixin",
@@ -105,7 +105,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "eac3e30f7f7f564c2bd110c7bb97390711e45e32",
"version": "92ea3c6a3f0ea2d1d55de168e65037e2313f9940",
"sum": "7vEamDTP9AApeiF4Zu9ZyXzDIs3rYHzwf9k7g8X+wsg="
},
{
@@ -116,7 +116,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "1a1859417696170f2ceaff34222942bd95bbda78",
"version": "1c321ed047ac57e34688e40a55349c9dfe2b72c8",
"sum": "u1YS9CVuBTcw2vks0PZbLb1gtlI/7bVGDVBZsjWFLTw="
},
{
@@ -127,8 +127,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "37a843fb60515ec34220bebb06a8d70d3a10a9fd",
"sum": "yUHQC9cVIWqQkGST1urZq4a3OFZXuW0w8YC5jsb0kjE="
"version": "89f35ef22db0dc24c523bf8be473bcbcf9ac81f6",
"sum": "KCO153lAOWmWfoj3rQGhLB+8UmyvQ2Bghu/ewDqVum4="
},
{
"name": "promgrafonnet",
@@ -138,7 +138,7 @@
"subdir": "lib/promgrafonnet"
}
},
"version": "92309e9c7a7637c38a12c0964e62a7aeccaf49ae",
"version": "b2d7f762bd22be3ba5e7d54a1fcecfe1092f214b",
"sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
},
{

1
kustomization.yaml
View File

@@ -59,6 +59,7 @@ resources:
- ./manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-clusterRole.yaml
- ./manifests/setup/prometheus-operator-clusterRoleBinding.yaml
- ./manifests/setup/prometheus-operator-deployment.yaml

4
manifests/prometheus-operator-serviceMonitor.yaml
View File

@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.1
app.kubernetes.io/version: v0.36.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.35.1
app.kubernetes.io/version: v0.36.0

1
manifests/prometheus-rules.yaml
View File

@@ -1079,6 +1079,7 @@ spec:
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
for: 2m
labels:
severity: warning
- alert: KubeletTooManyPods

13
manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
View File

@@ -6,6 +6,18 @@ metadata:
creationTimestamp: null
name: alertmanagers.monitoring.coreos.com
spec:
additionalPrinterColumns:
- JSONPath: .spec.version
description: The version of Alertmanager
name: Version
type: string
- JSONPath: .spec.replicas
description: The desired replicas number of Alertmanagers
name: Replicas
type: integer
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: monitoring.coreos.com
names:
kind: Alertmanager
@@ -13,6 +25,7 @@ spec:
plural: alertmanagers
singular: alertmanager
scope: Namespaced
subresources: {}
validation:
openAPIV3Schema:
description: Alertmanager describes an Alertmanager cluster.

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

@@ -6,6 +6,18 @@ metadata:
creationTimestamp: null
name: prometheuses.monitoring.coreos.com
spec:
additionalPrinterColumns:
- JSONPath: .spec.version
description: The version of Prometheus
name: Version
type: string
- JSONPath: .spec.replicas
description: The desired replicas number of Prometheuses
name: Replicas
type: integer
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: monitoring.coreos.com
names:
kind: Prometheus
@@ -13,6 +25,7 @@ spec:
plural: prometheuses
singular: prometheus
scope: Namespaced
subresources: {}
validation:
openAPIV3Schema:
description: Prometheus defines a Prometheus deployment.
@@ -4513,6 +4526,25 @@ spec:
Defaults to the value of `version`. Version is ignored if Tag
is set.
type: string
tracingConfig:
description: TracingConfig configures tracing in Thanos. This is
an experimental feature, it may change in any upcoming release
in a breaking way.
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
version:
description: Version describes the version of Thanos to use.
type: string

8
manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
View File

@@ -35,13 +35,17 @@ spec:
groups:
description: Content of Prometheus rule file
items:
description: RuleGroup is a list of sequentially evaluated recording
and alerting rules.
description: 'RuleGroup is a list of sequentially evaluated recording
and alerting rules. Note: PartialResponseStrategy is only used by
ThanosRuler and will be ignored by Prometheus instances. Valid
values for this field are ''warn'' or ''abort''. More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response'
properties:
interval:
type: string
name:
type: string
partial_response_strategy:
type: string
rules:
items:
description: Rule describes an alerting or recording rule.

3818
manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

7
manifests/setup/prometheus-operator-clusterRole.yaml
View File

@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.1
app.kubernetes.io/version: v0.36.0
name: prometheus-operator
rules:
- apiGroups:
@@ -21,6 +21,7 @@ rules:
- prometheuses.monitoring.coreos.com
- prometheusrules.monitoring.coreos.com
- servicemonitors.monitoring.coreos.com
- thanosrulers.monitoring.coreos.com
resources:
- customresourcedefinitions
verbs:
@@ -30,9 +31,11 @@ rules:
- monitoring.coreos.com
resources:
- alertmanagers
- alertmanagers/finalizers
- prometheuses
- prometheuses/finalizers
- alertmanagers/finalizers
- thanosrulers
- thanosrulers/finalizers
- servicemonitors
- podmonitors
- prometheusrules

2
manifests/setup/prometheus-operator-clusterRoleBinding.yaml
View File

@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.1
app.kubernetes.io/version: v0.36.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io

8
manifests/setup/prometheus-operator-deployment.yaml
View File

@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.1
app.kubernetes.io/version: v0.36.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.35.1
app.kubernetes.io/version: v0.36.0
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.1
image: quay.io/coreos/prometheus-operator:v0.35.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.36.0
image: quay.io/coreos/prometheus-operator:v0.36.0
name: prometheus-operator
ports:
- containerPort: 8080

2
manifests/setup/prometheus-operator-service.yaml
View File

@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.1
app.kubernetes.io/version: v0.36.0
name: prometheus-operator
namespace: monitoring
spec:

2
manifests/setup/prometheus-operator-serviceAccount.yaml
View File

@@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: v0.35.1
app.kubernetes.io/version: v0.36.0
name: prometheus-operator
namespace: monitoring