Skip to content

Commit

Permalink
Merge pull request newrelic#18594 from newrelic/sunny/reapply-changes
Browse files Browse the repository at this point in the history
reapply Nati's ElasticSearch install docs changes
  • Loading branch information
sunnyzanchi committed Sep 6, 2024
2 parents 1b35f9b + 30f6a25 commit 4102009
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 47 deletions.
2 changes: 1 addition & 1 deletion src/install/elasticsearch/default-install-linux.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ headingText: Configure the Elasticsearch integration
sudo cp elasticsearch-config.yml.sample elasticsearch-config.yml
```

3. Edit the ` elasticsearch-config.yml` file. This example config file collects all metrics and inventory from your localhost:
3. Edit the `elasticsearch-config.yml` file. This example config file collects all metrics and inventory from your localhost:

```yml
integrations:
Expand Down
13 changes: 9 additions & 4 deletions src/install/elasticsearch/find-data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ componentType: default
headingText: Find and use data
---

1. Go to **[one.newrelic.com](https://one.newrelic.com) > Integrations & Agents** and type **Elasticsearch**.
2. Under **Dashboards**, click **Elasticsearch overview dashboard**.
3. In the popup window, select your account, and follow the instructions in the UI.
4. Click **View dashboard**, and see your Elasticsearch data in New Relic.
1. Go to <DNT>**[one.newrelic.com](https://one.newrelic.com) > Integrations & Agents**</DNT> and search <DNT>**Elasticsearch**</DNT>.

2. Under <DNT>**Dashboards**</DNT>, click <DNT>**Elasticsearch monitoring**</DNT>.

3. A popup window opens. Click <DNT>**Edit**</DNT> if you want to change the account.

4. Click <DNT>**Setup Elasticsearch**</DNT> or <DNT>**Skip this step**</DNT> if you already setup this datasource.

5. Click <DNT>**View dashboard**</DNT>, and see your Elasticsearch data in New Relic.

<img
title="Elasticsearch dashboard"
Expand Down
6 changes: 1 addition & 5 deletions src/install/elasticsearch/linux/install-apt.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ componentType: default
headingText: Download using APT
---

1. From the command line, run these commands:
From the command line, run these commands:

```shell
sudo apt-get update
Expand All @@ -12,7 +12,3 @@ headingText: Download using APT
```shell
sudo apt-get install nri-elasticsearch
```

```

```
14 changes: 7 additions & 7 deletions src/install/elasticsearch/linux/install-linux.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ headingText: Configure the Elasticsearch 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 elasticsearch-config.yml.sample elasticsearch-config.yml
```
```shell
sudo cp elasticsearch-config.yml.sample elasticsearch-config.yml
```

3. Edit the ` elasticsearch-config.yml` file. This example config file collects all metrics and inventory from your localhost:
3. Edit the `elasticsearch-config.yml` file. This example config file collects all metrics and inventory from your localhost:

```yml
integrations:
Expand Down
2 changes: 1 addition & 1 deletion src/install/elasticsearch/linux/install-yum.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ componentType: default
headingText: Download using Yum
---

1. From the command line, run these commands:
From the command line, run these commands:

```shell
sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
Expand Down
2 changes: 1 addition & 1 deletion src/install/elasticsearch/linux/install-zypper.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ componentType: default
headingText: Download using Zypper
---

1. From the command line, run these commands:
From the command line, run these commands:

```shell
sudo zypper -n ref -r newrelic-infra
Expand Down
5 changes: 2 additions & 3 deletions src/install/elasticsearch/whatsNext.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ The Elasticsearch integration collects both Metrics and Inventory information. I
</td>

<td>
A way to further specify which cluster we are gathering data for, example:
'staging'.
A way to further specify which cluster we are gathering data, for example, 'staging'.
</td>

<td>
Expand Down Expand Up @@ -2736,4 +2735,4 @@ The Elasticsearch integration collects the following metrics. Each metric name i
</tbody>
</table>
</Collapser>
</CollapserGroup>
</CollapserGroup>
4 changes: 3 additions & 1 deletion src/install/elasticsearch/windows/install-msi.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ headingText: Download using MSI
---

1. Download the latest .MSI installer image for the desired integration [from our repository](https://download.newrelic.com/infrastructure_agent/windows/integrations/).

2. In an admin account, run the install script using an absolute path.
```

```shell
msiexec.exe /qn /i PATH\TO\nri-elasticsearch.msi
```
4 changes: 2 additions & 2 deletions src/install/elasticsearch/windows/install-windows.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ headingText: Configure the Elasticsearch integration
copy elasticsearch-config.yml.sample elasticsearch-config.yml
```

2. Edit the ` elasticsearch-config.yml` file. This example config file collects all metrics and inventory from your localhost:
2. Edit the `elasticsearch-config.yml` file. This example config file collects all metrics and inventory from your localhost:

```
```yml
integrations:
- name: nri-elasticsearch
env:
Expand Down
45 changes: 23 additions & 22 deletions src/nav/kubernetes-pixie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ pages:
- title: Kubernetes integration components
path: /docs/kubernetes-pixie/kubernetes-integration/get-started/kubernetes-components
- title: Compatibility and requirements
path: /docs/kubernetes-pixie/kubernetes-integration/get-started/kubernetes-integration-compatibility-requirements
path: /docs/kubernetes-pixie/kubernetes-integration/get-started/kubernetes-integration-compatibility-requirements
- title: Installation and configuration
pages:
- title: Install the Kubernetes integration
- title: Install the Kubernetes integration
path: /install/kubernetes
- title: Installation on AWS EKS Fargate
path: /docs/kubernetes-pixie/kubernetes-integration/installation/kubernetes-eks-fargate
Expand All @@ -23,12 +23,12 @@ pages:
path: /docs/kubernetes-pixie/kubernetes-integration/installation/k8s-agent-operator
- title: Manage Kubernetes alerts
pages:
- title: Predefined alert policy
path: /docs/kubernetes-pixie/kubernetes-integration/installation/predefined-alert-policy
- title: Recommended alert policy
path: /docs/kubernetes-pixie/kubernetes-integration/installation/recommended-alert-policy
- title: Create and modify Kubernetes alerts
path: /docs/kubernetes-pixie/kubernetes-integration/installation/create-alerts
- title: Predefined alert policy
path: /docs/kubernetes-pixie/kubernetes-integration/installation/predefined-alert-policy
- title: Recommended alert policy
path: /docs/kubernetes-pixie/kubernetes-integration/installation/recommended-alert-policy
- title: Create and modify Kubernetes alerts
path: /docs/kubernetes-pixie/kubernetes-integration/installation/create-alerts
- title: Link APM-instrumented apps to Kubernetes
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/link-apm-applications-kubernetes
- title: Link OTel-instrumented apps to Kubernetes
Expand All @@ -55,23 +55,23 @@ pages:
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/monitor-services/tutorial-monitor-redis-running-kubernetes
- title: Kubernetes integration version 2
pages:
- title: Overview
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/overview
- title: Changes introduced in v3
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/changes-since-v3
- title: Upgrade from v2
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/upgrade-v2
- title: Errors for v2
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/errors
- title: "Troubleshooting v2: Missing nodes"
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/troubleshooting
- title: Overview
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/overview
- title: Changes introduced in v3
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/changes-since-v3
- title: Upgrade from v2
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/upgrade-v2
- title: Errors for v2
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/errors
- title: 'Troubleshooting v2: Missing nodes'
path: /docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/k8s-version2/troubleshooting
- title: Uninstall Kubernetes integration
path: /docs/kubernetes-pixie/kubernetes-integration/installation/uninstall-kubernetes
path: /docs/kubernetes-pixie/kubernetes-integration/installation/uninstall-kubernetes
- title: Explore your Kubernetes data
pages:
- title: Kubernetes cluster
path: /docs/kubernetes-pixie/kubernetes-integration/understand-use-data/kubernetes-cluster-explorer
- title: Find and use your Kubernetes data
- title: Find and use your Kubernetes data
path: /docs/kubernetes-pixie/kubernetes-integration/understand-use-data/find-use-your-kubernetes-data
- title: Kubernetes events
path: /docs/kubernetes-pixie/kubernetes-integration/understand-use-data/kubernetes-events-integration
Expand All @@ -93,6 +93,8 @@ pages:
path: /docs/kubernetes-pixie/kubernetes-integration/troubleshooting/issues-with-istio
- title: Helm configurations are not applied globally
path: /docs/kubernetes-pixie/kubernetes-integration/troubleshooting/helm-configurations-not-applied
- title: OpenTelemetry for Kubernetes
path: /docs/kubernetes-pixie/kubernetes-integration/installation/k8s-otel
- title: Pixie
pages:
- title: Get to know Pixie
Expand All @@ -106,7 +108,7 @@ pages:
- title: Explore Pixie data
path: /docs/kubernetes-pixie/auto-telemetry-pixie/understand-use-data/explore-pixie-data
- title: Pixie Entities
path: /docs/kubernetes-pixie/auto-telemetry-pixie/understand-use-data/pixie-entities
path: /docs/kubernetes-pixie/auto-telemetry-pixie/understand-use-data/pixie-entities
- title: Live debugging with Pixie
path: /docs/kubernetes-pixie/auto-telemetry-pixie/understand-use-data/live-debugging-with-pixie
- title: Dashboard Pixie data
Expand Down Expand Up @@ -135,4 +137,3 @@ pages:
path: /docs/kubernetes-pixie/auto-telemetry-pixie/troubleshooting/get-pixie-logs
- title: Data and security for Auto-telemetry with Pixie
path: /docs/kubernetes-pixie/auto-telemetry-pixie/pixie-data-security-overview

0 comments on commit 4102009

Please sign in to comment.