ManageIQ / manageiq-documentation

Documentation for the ManageIQ Management Platform
https://www.manageiq.org/docs/
Other
38 stars 112 forks source link

Remove hawkular metrics documentation #1725

Closed agrare closed 1 year ago

agrare commented 1 year ago

This was removed from the provider in https://github.com/ManageIQ/manageiq-providers-kubernetes/pull/453

agrare commented 1 year ago

This should be backported to oparin but will likely conflict due to OCPv3 being completely removed from the docs on master, once this is in I'll put in an oparin direct PR

miq-bot commented 1 year ago

Checked commit https://github.com/agrare/manageiq-documentation/commit/a62c8a23bd0b868cbe12807dede779d87d994f90 with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint 0 files checked, 0 offenses detected Everything looks fine. :cake:

Fryguy commented 1 year ago

Backported to petrosian in commit a8c1085e90064f0bdb4996e441f60328e8b8770a.

commit a8c1085e90064f0bdb4996e441f60328e8b8770a
Author: Jason Frey <fryguy9@gmail.com>
Date:   Tue Apr 4 13:51:20 2023 -0400

    Merge pull request #1725 from agrare/remove_ocp_hawkular

    Remove hawkular metrics documentation

    (cherry picked from commit 0c456fda38e0b3b76dc527ed13c9c2ea7e89d544)
Fryguy commented 1 year ago

@agrare A conflict occurred during the backport of this pull request to oparin.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the oparin branch in order to resolve this.

Conflict details:

diff --cc _includes/provider-ocp-add-container.md
index 6e70ad75,9f5253da..00000000
--- a/_includes/provider-ocp-add-container.md
+++ b/_includes/provider-ocp-add-container.md
@@@ -62,39 -62,9 +62,39 @@@
      5.  Click **Validate** to confirm that {{ site.data.product.title_short }} can connect
          to the OpenShift Container Platform provider.

 +7.  In the **Alerts** endpoint tab optionally configure the alerts service:
 +
 +    1.  Select a service type, or leave disabled.  Prometheus alerts are only supported on OCP v3
 +
 +    2.  Select a **Security Protocol** method to specify how to
 +        authenticate the service:
 +
 +          - **SSL**: Authenticate the provider securely using a trusted
 +            Certificate Authority. Select this option if the provider
 +            has a valid SSL certificate and it is signed by a trusted
 +            Certificate Authority. No further configuration is required
 +            for this option.
 +
 +          - **SSL trusting custom CA**: Authenticate the provider with a
 +            self-signed certificate. For this option, copy your
 +            provider’s CA certificate to the **Trusted CA
 +            Certificates** box in PEM format.
 +
 +          - **SSL without validation**: Authenticate the provider
 +            insecurely using SSL. (Not recommended)
 +
 +    3.  Enter the **Hostname** (or IPv4 or IPv6 address) or alert
 +        **Route**.
 +
 +    4.  Enter the **API Port** if your Prometheus provider uses a
 +        non-standard port for access. The default port is `443`.
 +
 +    5.  Click **Validate** to confirm that {{ site.data.product.title_short }} can
 +        connect to the alerts service.
 +
  8. In the **Metrics** endpoint tab optionally configure the metrics service details:

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

      2.  Select a **Security Protocol** method to specify how to
          authenticate the service:
@@@ -141,15 -101,7 +131,19 @@@

          In this example you would use `prometheus-k8s-openshift-monitoring.ocp.example.com` as the metrics hostname.

++<<<<<<< HEAD
 +        On OCPv3 you can get the Hawkular route by running:
 +
 +        `oc get route hawkular-metrics -n openshift-infra`
 +
 +        Or the Prometheus route:
 +
 +        `oc get route prometheus -n openshift-metrics`
 +
 +    4.  Enter the **API Port** if your Hawkular or Prometheus provider
++=======
+     4.  Enter the **API Port** of your metrics endpoint
++>>>>>>> 0c456fda (Merge pull request #1725 from agrare/remove_ocp_hawkular)
          uses a non-standard port for access. The default port is `443`.

      5.  Click **Validate** to confirm that {{ site.data.product.title_short }} can connect