Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7294 from jcantrill/1537857_part2
Automatic merge from submit-queue. bug 1537857. Additional logging proxy metrics fixes This PR provides additional fixes to: * set the password correctly by properly decoding * modifying the default prometheus namespace if one isnt provided ref: https://bugzilla.redhat.com/show_bug.cgi?id=1537857
- Loading branch information
Showing
8 changed files
with
89 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 14 additions & 30 deletions
44
roles/openshift_logging_elasticsearch/templates/2.x/logging-metrics-role.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,15 @@ | ||
--- | ||
apiVersion: v1 | ||
kind: List | ||
items: | ||
- apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: Role | ||
metadata: | ||
annotations: | ||
rbac.authorization.kubernetes.io/autoupdate: "true" | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
rules: | ||
- apiGroups: | ||
- metrics.openshift.io | ||
resources: | ||
- prometheus | ||
verbs: | ||
- view | ||
- apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: RoleBinding | ||
metadata: | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: Role | ||
name: prometheus-metrics-viewer | ||
subjects: | ||
- kind: ServiceAccount | ||
namespace: {{ role_namespace }} | ||
name: {{ role_user }} | ||
apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: Role | ||
metadata: | ||
annotations: | ||
rbac.authorization.kubernetes.io/autoupdate: "true" | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
rules: | ||
- apiGroups: | ||
- metrics.openshift.io | ||
resources: | ||
- prometheus | ||
verbs: | ||
- view |
14 changes: 14 additions & 0 deletions
14
roles/openshift_logging_elasticsearch/templates/2.x/logging-metrics-rolebinding.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- | ||
apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: RoleBinding | ||
metadata: | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: Role | ||
name: prometheus-metrics-viewer | ||
subjects: | ||
- kind: ServiceAccount | ||
namespace: {{ role_namespace }} | ||
name: {{ role_user }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 14 additions & 30 deletions
44
roles/openshift_logging_elasticsearch/templates/5.x/logging-metrics-role.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,15 @@ | ||
--- | ||
apiVersion: v1 | ||
kind: List | ||
items: | ||
- apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: Role | ||
metadata: | ||
annotations: | ||
rbac.authorization.kubernetes.io/autoupdate: "true" | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
rules: | ||
- apiGroups: | ||
- metrics.openshift.io | ||
resources: | ||
- prometheus | ||
verbs: | ||
- view | ||
- apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: RoleBinding | ||
metadata: | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: Role | ||
name: prometheus-metrics-viewer | ||
subjects: | ||
- kind: ServiceAccount | ||
namespace: {{ role_namespace }} | ||
name: {{ role_user }} | ||
apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: Role | ||
metadata: | ||
annotations: | ||
rbac.authorization.kubernetes.io/autoupdate: "true" | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
rules: | ||
- apiGroups: | ||
- metrics.openshift.io | ||
resources: | ||
- prometheus | ||
verbs: | ||
- view |
14 changes: 14 additions & 0 deletions
14
roles/openshift_logging_elasticsearch/templates/5.x/logging-metrics-rolebinding.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- | ||
apiVersion: rbac.authorization.k8s.io/v1beta1 | ||
kind: RoleBinding | ||
metadata: | ||
name: prometheus-metrics-viewer | ||
namespace: {{ namespace }} | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: Role | ||
name: prometheus-metrics-viewer | ||
subjects: | ||
- kind: ServiceAccount | ||
namespace: {{ role_namespace }} | ||
name: {{ role_user }} |