public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docs: combines all SAML topics into one topic (#49443) (#49755)

Browse Source 
* Docs: combines all SAML topics into one topic (#49443)

* combines all SAML topics

* resolves merge conflicts

* makes prettier

(cherry picked from commit 8c84d62e3d)

* Fix broken relrefs

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
This commit is contained in:
Christopher Moyer
2022-05-31 09:27:07 -05:00
committed by GitHub
co-authored by Jack Baldry
parent adac77dd1f
commit 4b5adfb1ba
158 changed files with 729 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/installation/_index.md
+7 -7
View File
@@ -17,13 +17,13 @@ weight: 30
This section discusses the hardware and software requirements as well as the process of installing Grafana on different operating systems. This section has the following topics:
- [Requirements]({{< relref "requirements" >}})
- [Install on Debian or Ubuntu]({{< relref "debian" >}})
- [Install on RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)]({{< relref "rpm" >}})
- [Install on macOS]({{< relref "mac" >}})
- [Install on Windows]({{< relref "windows" >}})
- [Run Docker image]({{< relref "docker" >}})
- [Deploy Grafana on Kubernetes]({{< relref "kubernetes" >}})
- [Requirements]({{< relref "requirements/" >}})
- [Install on Debian or Ubuntu]({{< relref "debian/" >}})
- [Install on RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)]({{< relref "rpm/" >}})
- [Install on macOS]({{< relref "mac/" >}})
- [Install on Windows]({{< relref "windows/" >}})
- [Run Docker image]({{< relref "docker/" >}})
- [Deploy Grafana on Kubernetes]({{< relref "kubernetes/" >}})
For upgrade instructions, refer to [Upgrade Grafana]({{< relref "upgrading.md" >}}).
To restart Grafana, refer to [Restart Grafana]({{< relref "restart-grafana.md" >}}).
docs/sources/installation/requirements.md
+6 -6
View File
@@ -22,10 +22,10 @@ Grafana uses other open source software. Refer to [package.json](https://github.
The following operating systems are supported for Grafana installation:
- [Debian / Ubuntu]({{< relref "debian" >}})
- [RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)]({{< relref "rpm" >}})
- [macOS]({{< relref "mac" >}})
- [Windows]({{< relref "windows" >}})
- [Debian / Ubuntu]({{< relref "debian/" >}})
- [RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)]({{< relref "rpm/" >}})
- [macOS]({{< relref "mac/" >}})
- [Windows]({{< relref "windows/" >}})
Installation of Grafana on other operating systems is possible, but it is neither recommended nor supported.
@@ -39,8 +39,8 @@ Minimum recommended CPU: 1
Some features might require more memory or CPUs. Features require more resources include:
- [Server side rendering of images](https://grafana.com/grafana/plugins/grafana-image-renderer#requirements)
- [Alerting]({{< relref "../alerting" >}})
- [Data source proxy]({{< relref "../developers/http_api/data_source" >}})
- [Alerting]({{< relref "../alerting/" >}})
- [Data source proxy]({{< relref "../developers/http_api/data_source/" >}})
## Supported databases
docs/sources/installation/upgrading.md
+1 -1
View File
@@ -180,7 +180,7 @@ you can do that by:
- For data sources created through UI, you need to go to data source config, re-enter the password or basic auth
password and save the data source.
- For data sources created by provisioning, you need to update your config file and use secureJsonData.password or
secureJsonData.basicAuthPassword field. See [provisioning docs]({{< relref "../administration/provisioning" >}}) for example of current
secureJsonData.basicAuthPassword field. See [provisioning docs]({{< relref "../administration/provisioning/" >}}) for example of current
configuration.
### Embedding Grafana