Skip to content

Commit 4046941

Browse files
authored
Merge pull request #50143 from bburt-rh/RHDEVDOCS-4432-fix-for-pantheon-build-failure
RHDEVDOCS-4432- fix for Pantheon build failure
2 parents 25938cd + 1a74851 commit 4046941

File tree

7 files changed

+50
-33
lines changed

7 files changed

+50
-33
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,6 +2242,8 @@ Topics:
22422242
File: enabling-alert-routing-for-user-defined-projects
22432243
- Name: Managing metrics
22442244
File: managing-metrics
2245+
- Name: Querying metrics
2246+
File: querying-metrics
22452247
- Name: Managing metrics targets
22462248
File: managing-metrics-targets
22472249
- Name: Managing alerts

modules/monitoring-querying-metrics.adoc renamed to modules/monitoring-about-querying-metrics.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Module included in the following assemblies:
22
//
3-
// * monitoring/managing-metrics.adoc
3+
// * monitoring/querying-metrics.adoc
44
// * virt/logging_events_monitoring/virt-prometheus-queries.adoc
55

66
:_content-type: CONCEPT
7-
[id="querying-metrics_{context}"]
8-
= Querying metrics
7+
[id="about-querying-metrics_{context}"]
8+
= About querying metrics
99

1010
The {product-title} monitoring dashboard enables you to run Prometheus Query Language (PromQL) queries to examine metrics visualized on a plot. This functionality provides information about the state of a cluster and any user-defined workloads that you are monitoring.
1111

monitoring/managing-metrics.adoc

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,7 @@ include::modules/monitoring-specifying-how-a-service-is-monitored.adoc[leveloffs
3030
* xref:../rest_api/monitoring_apis/podmonitor-monitoring-coreos-com-v1.adoc[PodMonitor API]
3131
* xref:../rest_api/monitoring_apis/servicemonitor-monitoring-coreos-com-v1.adoc[ServiceMonitor API]
3232
33-
// Querying metrics
34-
include::modules/monitoring-querying-metrics.adoc[leveloffset=+1]
35-
//include::modules/monitoring-contents-of-the-metrics-ui.adoc[leveloffset=+2]
36-
include::modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc[leveloffset=+2]
37-
38-
[role="_additional-resources"]
39-
.Additional resources
40-
41-
* For more information about creating PromQL queries, see the link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Prometheus query documentation].
42-
43-
include::modules/monitoring-querying-metrics-for-user-defined-projects-as-a-developer.adoc[leveloffset=+2]
44-
45-
[role="_additional-resources"]
46-
.Additional resources
47-
48-
* For more information about creating PromQL queries, see the link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Prometheus query documentation].
49-
50-
include::modules/monitoring-exploring-the-visualized-metrics.adoc[leveloffset=+2]
51-
52-
[role="_additional-resources"]
53-
.Additional resources
54-
55-
* See xref:../monitoring/managing-metrics.adoc#querying-metrics_managing-metrics[Querying metrics] for details on using the PromQL interface
56-
* See xref:../monitoring/managing-metrics.adoc#querying-metrics-for-all-projects-as-an-administrator_managing-metrics[Querying metrics for all projects as an administrator] for details on accessing metrics for all projects as an administrator.
57-
* See xref:../monitoring/managing-metrics.adoc#querying-metrics-for-user-defined-projects-as-a-developer_managing-metrics[Querying metrics for user-defined projects as a developer] for details on accessing non-cluster metrics as a developer or a privileged user.
58-
33+
[id="next-steps_querying-metrics"]
5934
== Next steps
6035

61-
* xref:../monitoring/managing-metrics-targets.adoc#managing-metrics-targets[Managing metrics targets]
36+
* xref:../monitoring/querying-metrics.adoc#querying-metrics[Querying metrics]

monitoring/querying-metrics.adoc

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
:_content-type: ASSEMBLY
2+
[id="querying-metrics"]
3+
= Querying metrics
4+
include::_attributes/common-attributes.adoc[]
5+
:context: querying-metrics
6+
7+
toc::[]
8+
9+
You can query metrics to view data about how cluster components and your own workloads are performing.
10+
11+
// Querying metrics
12+
include::modules/monitoring-about-querying-metrics.adoc[leveloffset=+1]
13+
//include::modules/monitoring-contents-of-the-metrics-ui.adoc[leveloffset=+2]
14+
include::modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc[leveloffset=+2]
15+
16+
[role="_additional-resources"]
17+
.Additional resources
18+
19+
* For more information about creating PromQL queries, see the link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Prometheus query documentation].
20+
21+
include::modules/monitoring-querying-metrics-for-user-defined-projects-as-a-developer.adoc[leveloffset=+2]
22+
23+
[role="_additional-resources"]
24+
.Additional resources
25+
26+
* For more information about creating PromQL queries, see the link:https://prometheus.io/docs/prometheus/latest/querying/basics/[Prometheus query documentation].
27+
28+
include::modules/monitoring-exploring-the-visualized-metrics.adoc[leveloffset=+2]
29+
30+
[role="_additional-resources"]
31+
.Additional resources
32+
33+
* See xref:../monitoring/querying-metrics.adoc#about-querying-metrics_querying-metrics[Querying metrics] for details on using the PromQL interface
34+
* See xref:../monitoring/querying-metrics.adoc#querying-metrics-for-all-projects-as-an-administrator_querying-metrics[Querying metrics for all projects as an administrator] for details on accessing metrics for all projects as an administrator.
35+
* See xref:../monitoring/querying-metrics.adoc#querying-metrics-for-user-defined-projects-as-a-developer_querying-metrics[Querying metrics for user-defined projects as a developer] for details on accessing non-cluster metrics as a developer or a privileged user.
36+
37+
[id="next-steps_managing-metrics-targets"]
38+
== Next steps
39+
40+
* xref:../monitoring/managing-metrics-targets.adoc#managing-metrics-targets[Managing metrics targets]

networking/metallb/metallb-troubleshoot-support.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ include::modules/nw-metallb-metrics.adoc[leveloffset=+1]
2626
[role="_additional-resources"]
2727
.Additional resources
2828

29-
* See xref:../../monitoring/managing-metrics.adoc#querying-metrics_managing-metrics[Querying metrics] for information about using the monitoring dashboard.
29+
* See xref:../../monitoring/querying-metrics.adoc#querying-metrics[Querying metrics] for information about using the monitoring dashboard.
3030
3131
// Collecting data
3232
include::modules/nw-metallb-collecting-data.adoc[leveloffset=+1]

sandboxed_containers/monitoring-sandboxed-containers.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include::modules/sandboxed-containers-query-metrics.adoc[leveloffset=+1]
1717

1818
[role="_additional-resources"]
1919
.Additional resources
20-
* For more information about creating PromQL queries to view metrics, see xref:../monitoring/managing-metrics.adoc#querying-metrics_managing-metrics[Querying Metrics].
20+
* For more information about creating PromQL queries to view metrics, see xref:../monitoring/querying-metrics.adoc#querying-metrics[Querying metrics].
2121
2222
include::modules/sandboxed-containers-dashboard.adoc[leveloffset=+1]
2323

virt/logging_events_monitoring/virt-prometheus-queries.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Use the {product-title} monitoring dashboard to query virtualization metrics.
2222

2323
* For guest memory swapping queries to return data, memory swapping must be enabled on the virtual guests.
2424

25-
include::modules/monitoring-querying-metrics.adoc[leveloffset=+1]
25+
include::modules/monitoring-about-querying-metrics.adoc[leveloffset=+1]
2626

2727
include::modules/monitoring-querying-metrics-for-all-projects-as-an-administrator.adoc[leveloffset=+2]
2828

0 commit comments

Comments
 (0)