Merge pull request #3341 from rancher/master

Merge master to staging
This commit is contained in:
Catherine Luse
2021-06-15 18:17:32 -07:00
committed by GitHub
5 changed files with 83 additions and 10 deletions
@@ -46,6 +46,15 @@ Before you can install Monitoring V2, Monitoring V1 needs to be uninstalled comp
* Disable the cluster monitoring installation under Cluster -> Tools -> Monitoring
* Ensure that the cluster-monitoring app and the monitoring-operator app in the System project have been removed and are not recreated after a few minutes
#### RKE Template Clusters
To prevent v1 monitoring from being re-enabled, disable monitoring and in future RKE template revisions via modification of the RKE template yaml:
```yaml
enable_cluster_alerting: false
enable_cluster_monitoring: false
```
#### Migrating Grafana Dashboards
You can migrate any dashboard added to Grafana in Monitoring V1 to Monitoring V2. In Monitoring V1 you can export an existing dashboard like this:
@@ -5,6 +5,10 @@ weight: 7012
Each user can choose preferences to personalize their Rancher experience. To change preference settings, open the **User Settings** menu and then select **Preferences**.
The preferences available will differ depending on whether the **User Settings** menu was accessed while on the Cluster Manager UI or the Cluster Explorer UI.
{{% tabs %}}
{{% tab "Cluster Manager" %}}
## Theme
Choose your background color for the Rancher UI. If you choose **Auto**, the background color changes from light to dark at 6 PM, and then changes back at 6 AM.
@@ -16,3 +20,44 @@ This section displays the **Name** (your display name) and **Username** (your lo
## Table Row per Page
On pages that display system objects like clusters or deployments in a table, you can set the number of objects that display on the page before you must paginate. The default setting is `50`.
{{% /tab %}}
{{% tab "Cluster Explorer" %}}
## Theme
Choose your background color for the Rancher UI. If you choose **Auto**, the background color changes from light to dark at 6 PM, and then changes back at 6 AM.
## Login Landing Page
Choose the default page to display after logging in.
## Date Format
Choose your preferred format to display dates. By default, dates are displayed in the form `Wed, Jun 9 2021`.
## Time Format
Choose your preferred format to display time. By default, the 12-hour format is used.
## Table Row per Page
On pages that display system objects like clusters or deployments in a table, you can set the number of objects that display on the page before you must paginate. The default setting is `50`.
## YAML Editor Key Mapping
Choose the editor used when editing YAML configurations. When Emacs or Vim is chosen, the editor's shortcut commands can also be used.
## Enable Developer Tools & Features
Enables developer tools and features to be used.
## Hide All Type Description Boxes
Hides all description boxes.
## Helm Charts
When deploying applications from the "Apps & Marketplace", choose whether to show only released versions of the Helm chart or to include prerelease versions as well.
{{% /tab %}}
{{% /tabs %}}
@@ -15,7 +15,18 @@ private_registries:
password: mypassword
```
> **Note:** If you are using a Docker Hub registry, you can omit the `url` or set it to `docker.io`.
If you are using a Docker Hub registry, you can omit the `url` or set it to `docker.io`.
> **Note:** Although the directive is named `url`, there is no need to prefix the host or IP address with `https://`.
Valid `url` examples include:
```yaml
url: registry.com
url: registry.com:5555
url: 1.1.1.1
url: 1.1.1.1:5555/artifactory
```
### Default Registry
+8 -8
View File
@@ -30,24 +30,24 @@
<strong>We are transitioning to versioned documentation.</strong> The v2.x docs will no longer be maintained. For Rancher v2.5 docs, go <a href="https://rancher.com/docs/rancher/v2.5/en/">here.</a> For Rancher v2.0-v2.4 docs, go <a href="https://rancher.com/docs/rancher/v2.0-v2.4/en/">here.</a>
</div>
{{end}}
{{ if in .Dir "/rancher/v2.5/en/pipelines" }}
{{ if in .Dir "rancher/v2.5/en/pipelines" }}
<div class="alert alert-notice">
<strong>As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by <a href="https://rancher.com/docs/rancher/v2.5/en/fleet">Fleet</a>, available in Cluster Explorer.</strong>
<strong>As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by <a href="https://rancher.com/docs/rancher/v2.5/en/deploy-across-clusters/fleet/">Fleet</a>, available in Cluster Explorer.</strong>
</div>
{{end}}
{{ if in .Dir "/rancher/v2.x/en/pipelines" }}
{{ if in .Dir "rancher/v2.x/en/pipelines" }}
<div class="alert alert-notice">
<strong>As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by <a href="https://rancher.com/docs/rancher/v2.5/en/fleet">Fleet</a>, available in Cluster Explorer.</strong>
<strong>As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by <a href="https://rancher.com/docs/rancher/v2.5/en/deploy-across-clusters/fleet/">Fleet</a>, available in Cluster Explorer.</strong>
</div>
{{end}}
{{ if in .Dir "/rancher/v2.5/en/deploy-across-clusters/multi-cluster-apps" }}
{{ if in .Dir "rancher/v2.5/en/deploy-across-clusters/multi-cluster-apps" }}
<div class="alert alert-notice">
<strong>As of Rancher v2.5, we now recommend using <a href="https://rancher.com/docs/rancher/v2.5/en/fleet">Fleet</a> for deploying apps across clusters.</a>
<strong>As of Rancher v2.5, multi-cluster apps are deprecated.</strong> We now recommend using <a href="https://rancher.com/docs/rancher/v2.5/en/deploy-across-clusters/fleet/">Fleet</a> for deploying apps across clusters. It is available in Cluster Explorer.
</div>
{{end}}
{{ if in .Dir "/rancher/v2.x/en/deploy-across-clusters/multi-cluster-apps" }}
{{ if in .Dir "rancher/v2.x/en/deploy-across-clusters/multi-cluster-apps" }}
<div class="alert alert-notice">
<strong>As of Rancher v2.5, we now recommend using <a href="https://rancher.com/docs/rancher/v2.5/en/fleet">Fleet</a> for deploying apps across clusters.</a>
<strong>As of Rancher v2.5, multi-cluster apps are deprecated.</strong> We now recommend using <a href="https://rancher.com/docs/rancher/v2.5/en/deploy-across-clusters/fleet/">Fleet</a> for deploying apps across clusters. It is available in Cluster Explorer.
</div>
{{end}}
+9 -1
View File
@@ -1,4 +1,12 @@
User-agent: *
Disallow: {{ if ne (getenv "HUGO_ENV") "production" }}/{{ end }}
{{ if ne (getenv "HUGO_ENV") "production" }}
Disallow: /
{{ end }}
{{ range .Pages }}
{{ if in .Dir "rancher/v2.x" }}
Disallow: {{ .RelPermalink }}
{{end}}
{{ end }}
Sitemap: https://rancher.com/sitemap.xml