Skip to content

Commit

Permalink
Merge pull request #16885 from newrelic/fix-branching-indents
Browse files Browse the repository at this point in the history
Fix branching doc indents
  • Loading branch information
bradleycamacho committed Apr 17, 2024
2 parents 5e9928b + 7a85250 commit 2008032
Show file tree
Hide file tree
Showing 26 changed files with 506 additions and 511 deletions.
6 changes: 3 additions & 3 deletions src/install/apache-flink/check-metrics.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ headingText: Check for metrics

1. Use the following command to start an Apache Flink cluster:

```bash
./bin/start-cluster.sh
```
```bash
./bin/start-cluster.sh
```

2. Check for metrics on the following URLs

Expand Down
60 changes: 30 additions & 30 deletions src/install/apache-flink/configure-prometheus-apache.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@ headingText: Configure Prometheus for Apache Flink
1. Create the following file if it doesn't exist: `/etc/newrelic-infra/integrations.d/nri-prometheus-config.yml`
2. Paste the following information, updating `cluster_name` and and urls:

```
integrations:
- name: nri-prometheus
config:
standalone: false
# Defaults to true. When standalone is set to `false`, `nri-prometheus` requires an infrastructure agent to send data.
emitters: infra-sdk
# When running with infrastructure agent emitters will have to include infra-sdk
cluster_name: "YOUR_DESIRED_CLUSTER_NAME"
# Match the name of your cluster with the name seen in New Relic.
targets:
- description: "YOUR_DESIRED_DESCRIPTION_HERE"
urls: ["http://YOUR_DOMAIN:9250", "http://YOUR_DOMAIN:9251"]
# tls_config:
# ca_file_path: "/etc/etcd/etcd-client-ca.crt"
# cert_file_path: "/etc/etcd/etcd-client.crt"
# key_file_path: "/etc/etcd/etcd-client.key"
```
integrations:
- name: nri-prometheus
config:
standalone: false
# Defaults to true. When standalone is set to `false`, `nri-prometheus` requires an infrastructure agent to send data.
emitters: infra-sdk
# When running with infrastructure agent emitters will have to include infra-sdk
cluster_name: "YOUR_DESIRED_CLUSTER_NAME"
# Match the name of your cluster with the name seen in New Relic.
targets:
- description: "YOUR_DESIRED_DESCRIPTION_HERE"
urls: ["http://YOUR_DOMAIN:9250", "http://YOUR_DOMAIN:9251"]
# tls_config:
# ca_file_path: "/etc/etcd/etcd-client-ca.crt"
# cert_file_path: "/etc/etcd/etcd-client.crt"
# key_file_path: "/etc/etcd/etcd-client.key"
verbose: false
# Defaults to false. This determines whether or not the integration should run in verbose mode.
audit: false
# Defaults to false and does not include verbose mode. Audit mode logs the uncompressed data sent to New Relic and can lead to a high log volume.
# scrape_timeout: "YOUR_TIMEOUT_DURATION"
# `scrape_timeout` is not a mandatory configuration and defaults to 30s. The HTTP client timeout when fetching data from endpoints.
scrape_duration: "5s"
# worker_threads: 4
# `worker_threads` is not a mandatory configuration and defaults to `4` for clusters with more than 400 endpoints. Slowly increase the worker thread until scrape time falls between the desired `scrape_duration`. Note: Increasing this value too much results in huge memory consumption if too many metrics are scraped at once.
insecure_skip_verify: false
# Defaults to false. Determins if the integration should skip TLS verification or not.
timeout: 10s
```
verbose: false
# Defaults to false. This determines whether or not the integration should run in verbose mode.
audit: false
# Defaults to false and does not include verbose mode. Audit mode logs the uncompressed data sent to New Relic and can lead to a high log volume.
# scrape_timeout: "YOUR_TIMEOUT_DURATION"
# `scrape_timeout` is not a mandatory configuration and defaults to 30s. The HTTP client timeout when fetching data from endpoints.
scrape_duration: "5s"
# worker_threads: 4
# `worker_threads` is not a mandatory configuration and defaults to `4` for clusters with more than 400 endpoints. Slowly increase the worker thread until scrape time falls between the desired `scrape_duration`. Note: Increasing this value too much results in huge memory consumption if too many metrics are scraped at once.
insecure_skip_verify: false
# Defaults to false. Determins if the integration should skip TLS verification or not.
timeout: 10s
```
58 changes: 29 additions & 29 deletions src/install/apache/default-install-linux.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,40 @@ headingText: Configure the integration

1. Change directory to the integrations configuration folder by running:

```shell
cd /etc/newrelic-infra/integrations.d
```
```shell
cd /etc/newrelic-infra/integrations.d
```

2. Copy the sample configuration file by running:

```shell
sudo cp nri-apache-config.yml.sample nri-apache-config.yml
```
```shell
sudo cp nri-apache-config.yml.sample nri-apache-config.yml
```

3. Edit the `nri-apache-config.yml` file. The only two required fields are `_cluster_name` and `_uri`. This example config file collects all metrics:

```
integrations:
- name: nri-apache
env:
METRICS: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 15s
labels:
env: production
role: load_balancer
- name: nri-apache
env:
INVENTORY: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 60s
labels:
env: production
role: load_balancer
inventory_source: config/apache
```
```
integrations:
- name: nri-apache
env:
METRICS: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 15s
labels:
env: production
role: load_balancer
- name: nri-apache
env:
INVENTORY: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 60s
labels:
env: production
role: load_balancer
inventory_source: config/apache
```

You can find all the config options at the bottom of this doc along with more complex config examples.
12 changes: 6 additions & 6 deletions src/install/apache/linux/install-apt.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ headingText: Download using APT

1. From the command line, run these commands:

```shell
sudo apt-get update
```
```shell
sudo apt-get update
```

2. Run the following command:

```shell
sudo apt-get install nri-apache
```
```shell
sudo apt-get install nri-apache
```
58 changes: 29 additions & 29 deletions src/install/apache/linux/install-linux.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@ headingText: Download the integration

1. Change directory to the integrations configuration folder by running:

```shell
cd /etc/newrelic-infra/integrations.d
```
```shell
cd /etc/newrelic-infra/integrations.d
```

2. Copy the sample configuration file by running:

```shell
sudo cp nri-apache-config.yml.sample nri-apache-config.yml
```
```shell
sudo cp nri-apache-config.yml.sample nri-apache-config.yml
```

3. Edit the `nri-apache-config.yml` file. This example config file collects all metrics:

```
integrations:
- name: nri-apache
env:
METRICS: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 15s
labels:
env: production
role: load_balancer
- name: nri-apache
env:
INVENTORY: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 60s
labels:
env: production
role: load_balancer
inventory_source: config/apache
```
```
integrations:
- name: nri-apache
env:
METRICS: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 15s
labels:
env: production
role: load_balancer
- name: nri-apache
env:
INVENTORY: "true"
STATUS_URL: http://127.0.0.1/server-status?auto
REMOTE_MONITORING: true
interval: 60s
labels:
env: production
role: load_balancer
inventory_source: config/apache
```

You can find all the config options at the bottom of this doc along with more complex config examples.

Expand Down
12 changes: 6 additions & 6 deletions src/install/apache/linux/install-yum.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ headingText: Download using Yum

1. From the command line, run these commands:

```shell
sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
```
```shell
sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
```

2. Run the following command:

```shell
sudo yum install nri-apache
```
```shell
sudo yum install nri-apache
```
12 changes: 6 additions & 6 deletions src/install/apache/linux/install-zypper.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ headingText: Download using Zypper

1. From the command line, run these commands:

```shell
sudo zypper -n ref -r newrelic-infra
```
```shell
sudo zypper -n ref -r newrelic-infra
```

2. Run the following command:

```shell
sudo zypper -n install nri-apache
```
```shell
sudo zypper -n install nri-apache
```
22 changes: 11 additions & 11 deletions src/install/apache/windows/install-windows.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ headingText: Configure the integration

1. In the Integrations directory, `C:\Program Files\New Relic\newrelic-infra\integrations.d\`, create a copy of the sample configuration file by running:

```shell
copy 3-config.yml.sample 3-config.yml
```
```shell
copy 3-config.yml.sample 3-config.yml
```

2. Edit the `3-config.yml` file. The only two required fields are `_cluster_name` and `_uri`. This example config file collects all metrics:

```yml
integrations:
- name: nri-3
config:
_cluster_name: my_cluster
_uri: ://username:password@localhost:27017
exporter_port: 9126
```
```yml
integrations:
- name: nri-3
config:
_cluster_name: my_cluster
_uri: ://username:password@localhost:27017
exporter_port: 9126
```

You can find all the config options at the bottom of this doc along with more complex config examples.

0 comments on commit 2008032

Please sign in to comment.