This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 05ba4375f7ed01493b7c0d2b1dfb2c5ab8f45078
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Thu Jan 28 17:09:02 2021 +0100
chore(prometheus): Remove Quarkus references from the Prometheus trait
documentation
---
deploy/traits.yaml | 2 +-
docs/modules/traits/pages/prometheus.adoc | 4 +---
pkg/trait/prometheus.go | 6 ++----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/deploy/traits.yaml b/deploy/traits.yaml
index f130ae1..cb0bbc9 100755
--- a/deploy/traits.yaml
+++ b/deploy/traits.yaml
@@ -502,7 +502,7 @@ traits:
- Kubernetes
- Knative
- OpenShift
- description: 'The Prometheus trait configures a Prometheus-compatible
endpoint. This trait also exposes the integration with `Service` and
`ServiceMonitor` resources, so that the endpoint can be scraped automatically,
when using the Prometheus Operator. The metrics exposed vary depending on the
configured runtime. With the default Quarkus runtime, metrics are exposed using
MicroProfile Metrics. While with the Java main runtime, metrics are exposed
using the Prometheus JMX exporter. WAR [...]
+ description: 'The Prometheus trait configures a Prometheus-compatible
endpoint. This trait also exposes the integration with `Service` and
`ServiceMonitor` resources, so that the endpoint can be scraped automatically,
when using the Prometheus Operator. The metrics are exposed using MicroProfile
Metrics. WARNING: The creation of the `ServiceMonitor` resource requires the
https://github.com/coreos/prometheus-operator[Prometheus Operator] custom
resource definition to be installed. You c [...]
properties:
- name: enabled
type: bool
diff --git a/docs/modules/traits/pages/prometheus.adoc
b/docs/modules/traits/pages/prometheus.adoc
index 6ab4ef9..1bc57ac 100755
--- a/docs/modules/traits/pages/prometheus.adoc
+++ b/docs/modules/traits/pages/prometheus.adoc
@@ -5,9 +5,7 @@ The Prometheus trait configures a Prometheus-compatible
endpoint. This trait als
`Service` and `ServiceMonitor` resources, so that the endpoint can be scraped
automatically, when using the
Prometheus Operator.
-The metrics exposed vary depending on the configured runtime. With the default
Quarkus runtime, metrics are
-exposed using MicroProfile Metrics. While with the Java main runtime, metrics
are exposed using the Prometheus
-JMX exporter.
+The metrics are exposed using MicroProfile Metrics.
WARNING: The creation of the `ServiceMonitor` resource requires the
https://github.com/coreos/prometheus-operator[Prometheus Operator]
custom resource definition to be installed.
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 40e994c..6c4ffcb 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -31,12 +31,10 @@ import (
)
// The Prometheus trait configures a Prometheus-compatible endpoint. This
trait also exposes the integration with
-//`Service` and `ServiceMonitor` resources, so that the endpoint can be
scraped automatically, when using the
+// `Service` and `ServiceMonitor` resources, so that the endpoint can be
scraped automatically, when using the
// Prometheus Operator.
//
-// The metrics exposed vary depending on the configured runtime. With the
default Quarkus runtime, metrics are
-// exposed using MicroProfile Metrics. While with the Java main runtime,
metrics are exposed using the Prometheus
-// JMX exporter.
+// The metrics are exposed using MicroProfile Metrics.
//
// WARNING: The creation of the `ServiceMonitor` resource requires the
https://github.com/coreos/prometheus-operator[Prometheus Operator]
// custom resource definition to be installed.
