diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 2ab96c53efb3c2dcba5be9dfa131cfda938f7e39..e4f102c72997493325b2d4c17b250984b921b389 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -145,12 +145,18 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; 'pods', ]) + policyRule.withVerbs(['get', 'list', 'watch']); + local ingressRule = policyRule.new() + + policyRule.withApiGroups(['extensions']) + + policyRule.withResources([ + 'ingresses', + ]) + + policyRule.withVerbs(['get', 'list', 'watch']); local newSpecificRole(namespace) = role.new() + role.mixin.metadata.withName('prometheus-' + p.name) + role.mixin.metadata.withNamespace(namespace) + - role.withRules(coreRule); + role.withRules([coreRule, ingressRule]); local roleList = k3.rbac.v1.roleList; roleList.new([newSpecificRole(x) for x in p.roleBindingNamespaces]), @@ -182,8 +188,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; serviceAccountName: 'prometheus-' + p.name, serviceMonitorSelector: {}, podMonitorSelector: {}, + probeSelector: {}, serviceMonitorNamespaceSelector: {}, podMonitorNamespaceSelector: {}, + probeNamespaceSelector: {}, nodeSelector: { 'kubernetes.io/os': 'linux' }, ruleSelector: selector.withMatchLabels({ role: 'alert-rules', diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index af520a828b4f89d5aa644a019ef5908bb76f3afd..4b99429ee0b19f69306b2151ef92ebb2dec2f7d9 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -16,6 +16,8 @@ spec: kubernetes.io/os: linux podMonitorNamespaceSelector: {} podMonitorSelector: {} + probeNamespaceSelector: {} + probeSelector: {} replicas: 2 resources: requests: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index b920b886e3cfee0fe48648533df5206f277fe041..689baa932f888172044e553da52c2398f1282efa 100644 --- a/manifests/prometheus-roleSpecificNamespaces.yaml +++ b/manifests/prometheus-roleSpecificNamespaces.yaml @@ -16,6 +16,14 @@ items: - get - list - watch + - apiGroups: + - extensions + resources: + - ingresses + verbs: + - get + - list + - watch - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -32,6 +40,14 @@ items: - get - list - watch + - apiGroups: + - extensions + resources: + - ingresses + verbs: + - get + - list + - watch - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -48,4 +64,12 @@ items: - get - list - watch + - apiGroups: + - extensions + resources: + - ingresses + verbs: + - get + - list + - watch kind: RoleList