Skip to content

Commit 143fa25

Browse files
rosemarymaranorussgold
authored andcommitted
re-apply edits
1 parent ad99b7e commit 143fa25

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ WebLogic Monitoring Exporter
33

44
[![Build Status](https://travis-ci.org/oracle/weblogic-monitoring-exporter.svg?branch=master)](https://travis-ci.org/oracle/weblogic-monitoring-exporter)
55

6-
The WebLogic Monitoring Exporter uses the [WLS RESTful Management API](https://docs.oracle.com/middleware/1221/wls/WLRUR/overview.htm#WLRUR111) to scrape runtime information, and then exports [Prometheus](http://prometheus.io)-compatible metrics.
7-
It is deployed as a web application in a WebLogic Server (WLS) instance, version 12.2.1 or higher, typically, in the instance from which you want to get metrics.
6+
The WebLogic Monitoring Exporter uses the [WLS RESTful Management API](https://docs.oracle.com/middleware/1221/wls/WLRUR/overview.htm#WLRUR111) to scrape runtime information and then exports [Prometheus](http://prometheus.io)-compatible metrics.
7+
It is deployed as a web application in a WebLogic Server (WLS) instance, version 12.2.1 or later, typically, in the instance from which you want to get metrics.
88

99
## Building
1010

@@ -38,7 +38,7 @@ queries:
3838
key: servletName
3939
values: invocationTotalCount
4040
```
41-
Note that there are two parts to the configuration. The optional top portion defines general processing rules:
41+
Note that there are two parts to the configuration. The optional top portion defines general processing rules.
4242

4343
| Name | Description |
4444
| --- | --- |
@@ -56,7 +56,7 @@ Within each section, there are a number of options:
5656
| --- | --- |
5757
| `key` | The name of the attribute to use as a key for qualifiers in the output. |
5858
| `keyName` | The name to use for the key in the qualifier; defaults to the name of the attribute. |
59-
| `prefix` | A prefix to use for all metrics gathered from the current level. |
59+
| `prefix` | A prefix to use for all the metrics gathered from the current level. |
6060
| `values` | The attributes for which metrics are to be output. If not specified and a prefix is defined, all values on the MBean will be selected. |
6161
| `type` | A filter for subtypes. If specified, only those objects whose `type` attribute matches will be collected. |
6262

samples/kubernetes/deployments/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ All the examples are configured to be deployed in the `monitoring` namespace. Th
77

88
You can customize the examples to reflect a specific configuration.
99

10-
For more details on how to set up and run Prometheus and Kibana with the WebLogic Monitoring Exporter, see the blog post, [Using Prometheus and Grafana to Monitor WebLogic Server on Kubernetes](https://blogs.oracle.com/weblogicserver/use-prometheus-and-grafana-to-monitor-weblogic-server-on-kubernetes).
10+
For more details on how to set up and run Prometheus and Kibana with the WebLogic Monitoring Exporter, see the blog, [Using Prometheus and Grafana to Monitor WebLogic Server on Kubernetes](https://blogs.oracle.com/weblogicserver/use-prometheus-and-grafana-to-monitor-weblogic-server-on-kubernetes).
1111

1212

1313
## Copyright

samples/kubernetes/end2end/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Monitoring WebLogic Server with the Grafana Dashboard
2-
This is an end-to-end sample that shows you the steps to set up monitoring for WebLogic domains using Prometheus and Grafana from scratch. In the end, you'll have Prometheus, Grafana, and WLS domains installed, configured, and running. This sample includes Grafana dashboards to visualize the WebLogic Server runtime metrics.
2+
This is an end-to-end sample that shows you the steps to set up monitoring for WebLogic domains using Prometheus and Grafana. In the end, you'll have Prometheus, Grafana, and WLS domains installed, configured, and running. This sample includes Grafana dashboards to visualize the WebLogic Server runtime metrics.
33

44
First, let's look at [what's in the WebLogic Server Dashboard](docs/dashboard.md).
55

@@ -9,7 +9,7 @@ Before going into the detailed steps, look at the diagram below for the overall
99

1010
Here's how the WebLogic metrics come from WebLogic Server and get displayed in the dashboard:
1111
- WebLogic Servers expose their runtime data via the REST API.
12-
- The exporter, running on each WebLogic Server, acquires WebLogic data by calling the REST API, which it then translates to the Prometheus metrics format and exposes in an HTTP endpoint.
12+
- The exporter, running on each WebLogic Server instance, acquires WebLogic data by calling the REST API, which it then translates to the Prometheus metrics format and exposes in an HTTP endpoint.
1313
- The Prometheus server is responsible for periodically scraping the metrics from the endpoints and storing them in its time series database.
1414
- The Grafana server queries the metrics from Prometheus using PromQL and displays the metrics and series in a visualization dashboard.
1515

samples/kubernetes/end2end/docs/01-pv-path.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## Configuring the PV Path
2-
In this sample we need to create three Persistent Volumes (PV) and Persistent Volume Claims (PVC) to store data for MySQL, Prometheus, and Grafana. See the YAML files for the three PVs/PVCs.
2+
In this sample, we need to create three Persistent Volumes (PV) and Persistent Volume Claims (PVC) to store data for MySQL, Prometheus, and Grafana. See the YAML files for the three PVs/PVCs.
33
- [PV and PVC for MYSQL server](../mysql/persistence.yaml).
44
- [PV and PVC for Prometheus server](../prometheus/persistence.yaml).
55
- [PV and PVC for Grafana server](../grafana/persistence.yaml).
66

7-
> **Note**: To simply the configuration, we use `hostPath` PV that can only work in a single-node Kubernetes cluster so it's for demonstration purposes only. In a production environment, you would need to use a more sophisticated PV type like NFS, iSCSI. For more details, see the Kubernetes [Types of Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes) document.
7+
> **Note**: To simply the configuration, we use `hostPath` PV that can only work in a single-node Kubernetes cluster, therefore, it's for demonstration purposes only. In a production environment, you would need to use a more sophisticated PV type like NFS, iSCSI. For more details, see the Kubernetes [Types of Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes) document.
88
99
To simplify configuration and management, the three PVs will share the same root path. Prepare a host folder as the root path of the PVs.
1010

samples/kubernetes/end2end/docs/02-mysql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ kubectl get pod -l app=mysql
2121
NAME READY STATUS RESTARTS AGE
2222
mysql-7bf4d88f9-sbd25 1/1 Running 0 31h
2323
```
24-
Get pod name of MySQL server.
24+
Get the pod name of MySQL server.
2525
```
2626
POD_NAME=$(kubectl get pod -l app=mysql -o jsonpath="{.items[0].metadata.name}")
2727
```

samples/kubernetes/end2end/docs/03-wls-operator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Pull the WLS Kubernetes Operator 2.1 image.
88
docker pull oracle/weblogic-kubernetes-operator:2.1
99
```
1010
Pull the WebLogic 12.2.1.3 image from the Oracle Container Registry site.
11-
First, you need a valid user name and password to log in to the site. For details, see [here](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-in-image/base-images/_index.md#obtaining-standard-images-from-the-oracle-container-registry).
11+
First, you need a valid user name and password to log in to the site. For details, see [here](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-in-image/base-images/#obtaining-standard-images-from-the-oracle-container-registry).
1212
```
1313
docker login container-registry.oracle.com
1414
docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.3

samples/kubernetes/end2end/docs/05-prometheus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ prometheus-server NodePort 10.99.199.236 <none> 80:300
4141
```
4242
### Access the Prometheus web UI
4343
Now you can access the Prometheus web UI in your browser with the URL `http://<HostIP>:30000`.
44-
In the top menu, click `Status` and then `Targets`. The target page is displayed. Go to the bottom of the page. You'll find the two endpoints of `wls-domain1` are up and healthy.
44+
In the top menu, click `Status` and then `Targets`. The target page is displayed. Go to the bottom of the page. You'll find that the two endpoints of `wls-domain1` are up and healthy.
4545

4646
![Prometheus Targets](./images/prometheus-targets.png)
4747

samples/kubernetes/end2end/docs/dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
### Overview
33
The WebLogic Server Grafana dashboard provides a visualization of WebLogic Server runtime metrics allowing you to monitor and diagnose the runtime deployment of WebLogic Server.
44

5-
At the top, left-hand corner of the dashboard page, there are filters which let you filter out metrics based on different domains, different clusters, and different servers. Another filter is the `Top N` whose candidates values are 3, 5, 7, and 10. The value will be applied to some panels to show only the top N elements, to avoid too many elements being displayed.
5+
At the top, left-hand corner of the dashboard page, there are filters which let you filter out metrics based on different domains, different clusters, and different servers. Another filter is the `Top N` whose candidate values are 3, 5, 7, and 10. The value will be applied to panels to show only the top N elements, thus avoiding too many elements being displayed.
66

77
The WebLogic Server dashboard has four rows: `Servers`, `Web Applications`, `Data Sources` and `JMS Services`. Each row can be folded and unfolded separately.
88

0 commit comments

Comments
 (0)