Skip to content

Commit ca76838

Browse files
Merge pull request #18440 from spadgett/icon-cogs
Automatic merge from submit-queue (batch tested with PRs 18415, 18419, 18268, 18102, 18440). Replace icon-cogs with fa-cogs in templates `icon-cogs` has been removed. Update example templates to use `fa-cogs`, which is the replacement. Fixes openshift/origin-web-console#2767 /assign @rhamilto
2 parents dc275c5 + 3b1a4b2 commit ca76838

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

examples/grafana/grafana.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
"openshift.io/display-name": Grafana
88
description: |
99
Grafana server with patched Prometheus datasource.
10-
iconClass: icon-cogs
10+
iconClass: fa fa-cogs
1111
tags: "metrics,monitoring,grafana,prometheus"
1212
parameters:
1313
- description: The location of the grafana image

examples/heapster/heapster-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
"openshift.io/display-name": Heapster Metrics (Standalone)
77
description: |
88
A simple metrics solution for an OpenShift cluster. Expects to be installed in the 'kube-system' namespace.
9-
iconClass: icon-cogs
9+
iconClass: fa fa-cogs
1010
tags: "metrics,monitoring,heapster"
1111
labels:
1212
metrics-infra: heapster

examples/prometheus/prometheus-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
"openshift.io/display-name": Prometheus
77
description: |
88
A Prometheus deployment that can be customized to monitor components and dispatch alerts. It is secure by default and can be used to monitor arbitrary clients.
9-
iconClass: icon-cogs
9+
iconClass: fa fa-cogs
1010
tags: "monitoring,prometheus,alertmanager,time-series"
1111
parameters:
1212
- description: The location of the proxy image

examples/prometheus/prometheus.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
"openshift.io/display-name": Prometheus
77
description: |
88
A monitoring solution for an OpenShift cluster - collect and gather metrics and alerts from nodes, services, and the infrastructure. This is a tech preview feature.
9-
iconClass: icon-cogs
9+
iconClass: fa fa-cogs
1010
tags: "monitoring,prometheus, alertmanager,time-series"
1111
parameters:
1212
- description: The namespace to instantiate prometheus under. Defaults to 'kube-system'.

pkg/oc/bootstrap/bindata.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/extended/testdata/bindata.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)