Skip to content

Commit

Permalink
Merge pull request #18440 from spadgett/icon-cogs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
openshift-merge-robot authored Feb 5, 2018
2 parents dc275c5 + 3b1a4b2 commit ca76838
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion examples/grafana/grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
"openshift.io/display-name": Grafana
description: |
Grafana server with patched Prometheus datasource.
iconClass: icon-cogs
iconClass: fa fa-cogs
tags: "metrics,monitoring,grafana,prometheus"
parameters:
- description: The location of the grafana image
Expand Down
2 changes: 1 addition & 1 deletion examples/heapster/heapster-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
"openshift.io/display-name": Heapster Metrics (Standalone)
description: |
A simple metrics solution for an OpenShift cluster. Expects to be installed in the 'kube-system' namespace.
iconClass: icon-cogs
iconClass: fa fa-cogs
tags: "metrics,monitoring,heapster"
labels:
metrics-infra: heapster
Expand Down
2 changes: 1 addition & 1 deletion examples/prometheus/prometheus-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
"openshift.io/display-name": Prometheus
description: |
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.
iconClass: icon-cogs
iconClass: fa fa-cogs
tags: "monitoring,prometheus,alertmanager,time-series"
parameters:
- description: The location of the proxy image
Expand Down
2 changes: 1 addition & 1 deletion examples/prometheus/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
"openshift.io/display-name": Prometheus
description: |
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.
iconClass: icon-cogs
iconClass: fa fa-cogs
tags: "monitoring,prometheus, alertmanager,time-series"
parameters:
- description: The namespace to instantiate prometheus under. Defaults to 'kube-system'.
Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/bootstrap/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/extended/testdata/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ca76838

Please sign in to comment.