Skip to content

Commit 0c456fd

Browse files
authored
Merge pull request #1725 from agrare/remove_ocp_hawkular
Remove hawkular metrics documentation
2 parents 80f9138 + a62c8a2 commit 0c456fd

File tree

6 files changed

+10
-175
lines changed

6 files changed

+10
-175
lines changed

_includes/provider-ocp-add-container.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
8. In the **Metrics** endpoint tab optionally configure the metrics service details:
6666

67-
1. Select a service type (Prometheus or Hawkular) or leave disabled
67+
1. Select a service type (e.g.: Prometheus) or leave disabled
6868

6969
2. Select a **Security Protocol** method to specify how to
7070
authenticate the service:
@@ -80,16 +80,6 @@
8080
provider’s CA certificate to the **Trusted CA
8181
Certificates** box in PEM format.
8282

83-
**Note:**
84-
85-
In OpenShift, the default deployment of the router generates
86-
certificates during installation, which can be used with the
87-
**SSL trusting custom CA** option. Connecting a Hawkular
88-
endpoint with this option requires the CA certificate that
89-
the cluster uses for service certificates, which is stored
90-
in `/etc/origin/master/service-signer.crt` on the first
91-
master in a cluster.
92-
9383
- **SSL without validation**: Authenticate the provider
9484
insecurely using SSL. (Not recommended)
9585

@@ -111,7 +101,7 @@
111101
112102
In this example you would use `prometheus-k8s-openshift-monitoring.ocp.example.com` as the metrics hostname.
113103
114-
4. Enter the **API Port** if your Hawkular or Prometheus provider
104+
4. Enter the **API Port** of your metrics endpoint
115105
uses a non-standard port for access. The default port is `443`.
116106
117107
5. Click **Validate** to confirm that {{ site.data.product.title_short }} can connect

api/reference/providers.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ Compound credentials set:
264264

265265
When creating or updating providers, connection configurations can be
266266
set. Connection configurations can be used to specify resources such as
267-
an `amqp` event provider for OpenStack, adding Hawkular metrics, or an
267+
an `amqp` event provider for OpenStack, adding Prometheus metrics, or an
268268
authentication token.
269269

270-
Hawkular metrics:
270+
Prometheus metrics:
271271

272272
``` json
273273
{
@@ -277,16 +277,16 @@ Hawkular metrics:
277277
"connection_configurations": [
278278
{
279279
"endpoint": {
280-
"role" : "hawkular",
281-
"hostname" : "hawkular_host",
282-
"port" : "1443",
280+
"role" : "prometheus",
281+
"hostname" : "prometheus_host",
282+
"port" : "443",
283283
"security_protocol" : "ssl-without-validation",
284284
"certificate_authority" : "-----BEGIN CERTIFICATE-----",
285285
"verify_ssl": 0
286286
},
287287
"authentication": {
288-
"role" : "hawkular",
289-
"auth_key" : "hawkular_auth_key"
288+
"role" : "prometheus",
289+
"auth_key" : "prometheus_auth_key"
290290
}
291291
}
292292
]

api/reference/settings.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ The complete updated settings is returned:
123123
“purge_window_size” : 500
124124
},
125125
...
126-
"hawkular_tenant_labels": {
127-
"_hawkular_admin": "Hawkular Admin"
128-
}
129126
}
130127
```
131128

integration_with_openshift_container_platform/_topics/ocp-metrics.md

Lines changed: 0 additions & 148 deletions
This file was deleted.

integration_with_openshift_container_platform/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
{% include_relative _topics/prerequisites.md %}
1313

14-
## Enabling OpenShift Container Platform Metrics
15-
16-
{% include_relative _topics/ocp-metrics.md %}
17-
1814
## Retrieving the OpenShift Container Platform Management Token
1915

2016
{% include_relative _topics/ocp-retrieve-tokens.md %}

managing_providers/_topics/editing_a_containers_provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Edit information about a provider such as the name, hostname, IP address or port
5151

5252
5. Click **Validate** to confirm that {{ site.data.product.title_short }} can connect to the OpenShift Container Platform provider.
5353

54-
6. Under **Endpoints** in the **Metrics** tab, configure the following for gathering capacity and utilization metrics for Hawkular or Prometheus based on the selection:
54+
6. Under **Endpoints** in the **Metrics** tab, configure the following for gathering capacity and utilization metrics for Prometheus based on the selection:
5555

5656
1. Select a **Security Protocol** method to specify how to authenticate the provider:
5757

0 commit comments

Comments
 (0)