Improve Docs #298
Merged
Improve Docs #298
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improve docs
Freno misc doc fixes
drduke1
approved these changes
Nov 14, 2019
samjsong
reviewed
Nov 14, 2019
deploy/docs/Non_Helm_Installation.md
Outdated
|
|
||
| Install `prometheus-operator` by generating the yaml files using Helm: | ||
|
|
||
| ```bash | ||
| $ helm template stable/prometheus-operator --name prometheus-operator --set dryRun=true -f prometheus-overrides.yaml > prometheus.yaml | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
There's some merge conflicts here, I see we have the other helm fetch command on line 189 above that conflicts with line 214 here
There was a problem hiding this comment.
sigh, something is really messed up with my Git. Thanks @samjsong
| @@ -219,6 +236,12 @@ kubectl -n sumologic logs prometheus-prometheus-operator-prometheus-0 prometheus | |||
|
|
|||
| At this point setup is complete and metrics data is being sent to Sumo Logic. | |||
|
|
|||
| <<<<<<< HEAD | |||
| __NOTE__ You can also [send custom metrics](additional_prometheus_configuration.md#custom-metrics)to Sumo Logic from Prometheus. | |||
There was a problem hiding this comment.
Merge conflicts here as well
deploy/docs/Non_Helm_Installation.md
Outdated
|
|
||
| If you would like to collect other metrics that are not listed in `prometheus-overrides.yaml`, you can add a new section to the file. | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
Merge conflicts here as well
frankreno
added a commit
to frankreno/sumologic-kubernetes-collection
that referenced
this pull request
Nov 14, 2019
Merge pull request SumoLogic#298 from frankreno/master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fill in your description here.
Improve non-helm install docs with more detailed steps and move filter/trim/relabel/custom metrics docs to standalone documentation.
Testing performed