Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add prom oper compatibility note to docs #1321

Merged
merged 1 commit into from
Jan 12, 2021
Merged

Add prom oper compatibility note to docs #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion deploy/docs/SideBySidePrometheus.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

When installing our Helm Chart it is possible to have more than one Prometheus server running in the same cluster. However, do note that you cannot have more than one Prometheus Operator running in the same cluster. This document will take you through the steps to set up Sumo Logic collection when you have an existing Prometheus Operator you wish to keep intact.

**Note**: Make sure your `Prometheus Operator` and/or `Prometheus Operator Chart` are compatible with the version used by the Collection

# Installation with Helm

Our Helm chart deploys Kubernetes resources for collecting Kubernetes logs, metrics, and events; enriching them with deployment, pod, and service level metadata; and sends them to Sumo Logic.
Expand Down Expand Up @@ -186,4 +188,4 @@ To remove the Kubernetes secret:
kubectl delete secret sumologic
```

Then delete the associated hosted collector in the Sumo Logic UI.
Then delete the associated hosted collector in the Sumo Logic UI.
4 changes: 3 additions & 1 deletion deploy/docs/existingPrometheusDoc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ Once you have completed installation, you can [install the Kubernetes App and vi

## Merge Prometheus Configuration

If you have customized your Prometheus configuration, follow these steps to merge the configurations.
**Note**: Make sure your `Prometheus Operator` and/or `Prometheus Operator Chart` are compatible with the version used by the Collection

If you have customized your Prometheus configuration, follow these steps to merge the configurations.

Helm supports providing multiple configuration files, and priority will be given to the last (right-most) file specified. You can obtain your current prometheus configuration by running

Expand Down