Skip to content

Commit 13e7522

Browse files
authored
Merge pull request #19 from marioferh/fix_markdown
fix markdown
2 parents 61abd3e + 85e2224 commit 13e7522

File tree

155 files changed

+1203
-1163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1203
-1163
lines changed

docs/index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ Thank you for visiting the official documentation. Here you'll find all the info
6464
- [Additional Configuration](prometheus-operator/additional-scrape-config.md)
6565
- [Platform Specific Guides](prometheus-operator/platform/)
6666
- [Developer Documentation](prometheus-operator/developer/)
67-
68-
---
67+
##
6968

7069
## Introduction
7170

@@ -76,7 +75,6 @@ Key features:
7675
- Service discovery and monitoring
7776
- Custom resource definitions for monitoring configuration
7877
- Integration with various platforms and environments
79-
80-
---
78+
##
8179

8280
If you have any questions or suggestions, feel free to contact us.

docs/introduction.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ lastmod: "2020-10-06T08:48:57+00:00"
1010
images: []
1111
draft: false
1212
description: The Prometheus Operator provides Kubernetes native deployment and management of Prometheus and related monitoring components
13-
date: "2020-10-06T08:48:57+00:00"
14-
---
13+
## date: "2020-10-06T08:48:57+00:00"
1514

1615
Prometheus Operator is a [Kubernetes Operator](https://github.com/cncf/tag-app-delivery/blob/main/operator-wg/whitepaper/Operator-WhitePaper_v1-0.md#foundation) that provides Kubernetes native deployment and management of [Prometheus](https://prometheus.io/) and related monitoring components.
1716

1817
The Prometheus operator includes, but is not limited to, the following features:
1918

20-
- **Kubernetes Custom Resources**: Use Kubernetes custom resources to deploy and manage Prometheus, Alertmanager, and related components.
19+
- __Kubernetes Custom Resources__: Use Kubernetes custom resources to deploy and manage Prometheus, Alertmanager, and related components.
2120

22-
- **Simplified Deployment Configuration**: Configure the fundamentals of Prometheus like versions, persistence, retention policies, and replicas from a native Kubernetes resource.
21+
- __Simplified Deployment Configuration__: Configure the fundamentals of Prometheus like versions, persistence, retention policies, and replicas from a native Kubernetes resource.
2322

24-
- **Prometheus Target Configuration**: Automatically generate monitoring target configurations based on familiar Kubernetes label queries; no need to learn a Prometheus specific configuration language.
23+
- __Prometheus Target Configuration__: Automatically generate monitoring target configurations based on familiar Kubernetes label queries; no need to learn a Prometheus specific configuration language.
2524

2625
Prometheus Operator provides a set of Custom Resource Definitions(CRDs) that allows you to configure your Prometheus and related instances. Currently, the CRDs provided by Prometheus Operator are:
2726

@@ -42,11 +41,11 @@ Prometheus Operator provides a set of Custom Resource Definitions(CRDs) that all
4241

4342
- To significantly reduce the effort required to configure, implement and manage all components of Prometheus based monitoring stack.
4443

45-
- **Automation** - Automate the management of Prometheus monitoring targets, ultimately increasing efficiency. This automation is performed by the use of Kubernetes [Custom Resource Definition](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/). The Operator introduces custom resources like `Prometheus`, `Alertmanager`, `ThanosRuler`, and others, which help automate the deployment and configuration of these resources.
44+
- __Automation__ - Automate the management of Prometheus monitoring targets, ultimately increasing efficiency. This automation is performed by the use of Kubernetes [Custom Resource Definition](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/). The Operator introduces custom resources like `Prometheus`, `Alertmanager`, `ThanosRuler`, and others, which help automate the deployment and configuration of these resources.
4645

47-
- **Configuration Abstraction and Validation** - Instead of learning and manually writing Prometheus Relabeling rules (which can be time consuming), you can simply use Kubernetes [Label Selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors). `ServiceMonitor`, `PodMonitor` and `Probe` custom resources provide this abstraction. The Operator also removes the complexity of validating the configuration of `AlertmanagerConfig` and `PrometheusRule` objects.
46+
- __Configuration Abstraction and Validation__ - Instead of learning and manually writing Prometheus Relabeling rules (which can be time consuming), you can simply use Kubernetes [Label Selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors). `ServiceMonitor`, `PodMonitor` and `Probe` custom resources provide this abstraction. The Operator also removes the complexity of validating the configuration of `AlertmanagerConfig` and `PrometheusRule` objects.
4847

49-
- **Scaling** - There are many scaling-related features provided by the Operator like [ThanosRuler](https://prometheus-operator.dev/docs/platform/thanos/#thanos-ruler) custom resource for rule evaluation, workload distribution across multiple Prometheus instances using scrape target sharding, and running [Thanos sidecar](https://thanos.io/v0.4/components/sidecar/) in Prometheus instance for long-term storage.
48+
- __Scaling__ - There are many scaling-related features provided by the Operator like [ThanosRuler](https://prometheus-operator.dev/docs/platform/thanos/#thanos-ruler) custom resource for rule evaluation, workload distribution across multiple Prometheus instances using scrape target sharding, and running [Thanos sidecar](https://thanos.io/v0.4/components/sidecar/) in Prometheus instance for long-term storage.
5049

5150
### Next Steps
5251

docs/openshift/monitoring-about-accessing-monitoring-web-service-apis.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ You can directly access web service API endpoints from the command line for the
99
* Thanos Ruler
1010
* Thanos Querier
1111

12-
[IMPORTANT]
13-
====
14-
To access Thanos Ruler and Thanos Querier service APIs, the requesting account must have `get` permission on the namespaces resource, which can be granted by binding the `cluster-monitoring-view` cluster role to the account.
15-
====
12+
# [IMPORTANT]
13+
# To access Thanos Ruler and Thanos Querier service APIs, the requesting account must have `get` permission on the namespaces resource, which can be granted by binding the `cluster-monitoring-view` cluster role to the account.
1614

1715
When you access web service API endpoints for monitoring components, be aware of the following limitations:
1816

docs/openshift/monitoring-about-cluster-monitoring.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
ifeval::["{context}" == "understanding-the-monitoring-stack"]
44
:ocp-monitoring:
55

6-
7-
86
# About OpenShift monitoring
97

108
:ocp-monitoring!:
@@ -13,12 +11,9 @@ OpenShift includes a preconfigured, preinstalled, and self-updating monitoring s
1311

1412
After installing OpenShift , cluster administrators can optionally enable *monitoring for user-defined projects*. By using this feature, cluster administrators, developers, and other users can specify how services and pods are monitored in their own projects. You can then query metrics, review dashboards, and manage alerting rules and silences for your own projects in the OpenShift web console.
1513

16-
[NOTE]
17-
====
18-
Cluster administrators can grant developers and other users permission to monitor their own projects. Privileges are granted by assigning one of the predefined monitoring roles.
19-
====
14+
# [NOTE]
15+
# Cluster administrators can grant developers and other users permission to monitor their own projects. Privileges are granted by assigning one of the predefined monitoring roles.
2016

2117
[id="about-openshift-monitoring_{context}"]
2218
ifeval::["{context}" == "understanding-the-monitoring-stack"]
2319
:!ocp-monitoring:
24-

docs/openshift/monitoring-about-creating-alerting-rules-for-user-defined-projects.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ However, the rule cannot include metrics from a different `ns2` user-defined pro
1717
* To reduce latency and to minimize the load on core platform monitoring components, you can add the `openshift.io/prometheus-rule-evaluation-scope: leaf-prometheus` label to a rule.
1818
This label forces only the Prometheus instance deployed in the `openshift-user-workload-monitoring` project to evaluate the alerting rule and prevents the Thanos Ruler instance from doing so.
1919
+
20-
[IMPORTANT]
21-
====
20+
# [IMPORTANT]
2221
If an alerting rule has this label, your alerting rule can use only those metrics exposed by your user-defined project.
23-
Alerting rules you create based on default platform metrics might not trigger alerts.
24-
====
25-
26-
27-
22+
# Alerting rules you create based on default platform metrics might not trigger alerts.

docs/openshift/monitoring-about-managing-alerts.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ In the OpenShift, the Alerting UI enables you to manage alerts, silences, and al
88
* *Alerts*. An alert is fired when the conditions defined in an alerting rule are true. Alerts provide a notification that a set of circumstances are apparent within an OpenShift cluster.
99
* *Silences*. A silence can be applied to an alert to prevent notifications from being sent when the conditions for an alert are true. You can mute an alert after the initial notification, while you work on resolving the issue.
1010

11-
[NOTE]
12-
====
13-
The alerts, silences, and alerting rules that are available in the Alerting UI relate to the projects that you have access to. For example, if you are logged in as a user with the `cluster-admin` role, you can access all alerts, silences, and alerting rules.
14-
====
11+
# [NOTE]
12+
# The alerts, silences, and alerting rules that are available in the Alerting UI relate to the projects that you have access to. For example, if you are logged in as a user with the `cluster-admin` role, you can access all alerts, silences, and alerting rules.

docs/openshift/monitoring-about-monitoring-dashboards.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ image::monitoring-dashboard-administrator.png[]
2121
In the *Developer* perspective, you can access only the Kubernetes compute resources dashboards:
2222

2323
.Example dashboard in the Developer perspective
24-
image::observe-dashboard-developer.png[]
24+
image::observe-dashboard-developer.png[]

docs/openshift/monitoring-about-specifying-limits-and-requests-for-monitoring-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ You can configure resource limits and requests for the following components that
2323

2424
By defining the resource limits, you limit a container's resource usage, which prevents the container from exceeding the specified maximum values for CPU and memory resources.
2525

26-
By defining the resource requests, you specify that a container can be scheduled only on a node that has enough CPU and memory resources available to match the requested resources.
26+
By defining the resource requests, you specify that a container can be scheduled only on a node that has enough CPU and memory resources available to match the requested resources.

docs/openshift/monitoring-accessing-alerting-rules-for-your-project.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@ To list alerting rules for a user-defined project, you must have been assigned t
1414

1515
. To list alerting rules in `<project>`:
1616
+
17+
1718
```terminal
1819
$ oc -n <project> get prometheusrule
20+
1921
```
2022

2123
. To list the configuration of an alerting rule, run the following:
2224
+
25+
2326
```terminal
2427
$ oc -n <project> get prometheusrule <rule> -o yaml
28+
2529
```
Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
11
:_mod-docs-content-type: PROCEDURE
22

3-
4-
5-
63
[id="monitoring-accessing-the-alerting-ui-adm_{context}"]
74
# Accessing the Alerting UI from the Administrator perspective
85

9-
10-
116
[id="monitoring-accessing-the-alerting-ui-dev_{context}"]
127
# Accessing the Alerting UI from the Developer perspective
138

14-
15-
16-
17-
189
:perspective: Administrator
1910

20-
21-
2211
:perspective: Developer
2312

24-
2513
The Alerting UI is accessible through the *{perspective}* perspective of the OpenShift web console.
2614

27-
2815
* From the *Administrator* perspective, go to *Observe* -> *Alerting*. The three main pages in the Alerting UI in this perspective are the *Alerts*, *Silences*, and *Alerting rules* pages.
2916

30-
31-
3217
* From the *Developer* perspective, go to *Observe* and go to the *Alerts* tab.
3318
* Select the project that you want to manage alerts for from the *Project:* list.
3419

3520
In this perspective, alerts, silences, and alerting rules are all managed from the *Alerts* tab. The results shown in the *Alerts* tab are specific to the selected project.
3621

37-
[NOTE]
38-
====
39-
In the *Developer* perspective, you can select from core OpenShift and user-defined projects that you have access to in the *Project: <project_name>* list. However, alerts, silences, and alerting rules relating to core OpenShift projects are not displayed if you are not logged in as a cluster administrator.
40-
====
41-
42-
22+
# [NOTE]
23+
# In the *Developer* perspective, you can select from core OpenShift and user-defined projects that you have access to in the *Project: <project_name>* list. However, alerts, silences, and alerting rules relating to core OpenShift projects are not displayed if you are not logged in as a cluster administrator.
4324

4425
:!perspective:

0 commit comments

Comments
 (0)