Merge branch 'master' into app-diagnose-chat

robusta-dev · Jan 30, 2025 · 488d5fd · 488d5fd
2 parents 90c3275 + f0004b8
commit 488d5fd
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 170 deletions.
diff --git a/docs/_images/99fcc86f5a32394a39110af37d30d234bcd01044 b/docs/_images/99fcc86f5a32394a39110af37d30d234bcd01044
diff --git a/docs/conf.py b/docs/conf.py
@@ -115,7 +115,12 @@
     "tutorials/alert-remediation.html": "/master/playbook-reference/prometheus-examples/alert-remediation.html",
     "tutorials/alert-custom-enrichment.html": "/master/playbook-reference/prometheus-examples/alert-custom-enrichment.html",
     "catalog/sinks/slack.html": "/master/configuration/sinks/slack.html",
-    "user-guide/sinks-configuration.html": "master/notification-routing/routing-with-scopes.html"
+    "user-guide/sinks-configuration.html": "/master/notification-routing/routing-with-scopes.html",
+    "tutorials/alert-builtin-enrichment.html": "/master/how-it-works/alert-builtin-enrichment.html",
+    "tutorials/robusta-runner-metrics.html": "/master/setup-robusta/robusta-runner-metrics.html",
+    "tutorials/alert-custom-prometheus.html": "/master/configuration/alertmanager-integration/alert-custom-prometheus.html",
+    "catalog/triggers/prometheus.html": "/master/configuration/alertmanager-integration/index.html",
+
 }
 
 

diff --git a/docs/tutorials/alert-custom-prometheus.rst → ...r-integration/alert-custom-prometheus.rst b/docs/tutorials/alert-custom-prometheus.rst → ...r-integration/alert-custom-prometheus.rst
diff --git a/docs/configuration/alertmanager-integration/index.rst b/docs/configuration/alertmanager-integration/index.rst
@@ -17,6 +17,7 @@ Integrating with Prometheus
    grafana-alert-manager
    embedded-prometheus
    troubleshooting-alertmanager
+   alert-custom-prometheus
 
 
 

diff --git a/docs/configuration/sinks/RobustaUI.rst b/docs/configuration/sinks/RobustaUI.rst
@@ -1,34 +1,44 @@
 Robusta UI
 #################
 
-Robusta can send issues and events in your Kubernetes cluster to the `Robusta UI <https://home.robusta.dev/>`_.
+Take your Kubernetes monitoring to the next level with a Robusta UI integration:
 
-.. image:: /images/robusta-ui.gif
-  :align: center
+- **AI Assistant**: Solve alerts faster with an AI assistant that highlights relevant observability data
+- **Alert Timeline**: View Prometheus alerts across multiple clusters and spot correlations with a powerful timeline view
+- **Change Tracking**: Correlate alerts with changes to your infrastructure or applications, with Robusta’s automatic change tracking for Kubernetes
+
+.. raw:: html
+
+    <div style="text-align: center;">
+      <a href="https://www.loom.com/share/89c7e098d9494d79895738e0b06091f0" target="_blank" rel="noopener noreferrer">
+          <img src="https://cdn.loom.com/sessions/thumbnails/89c7e098d9494d79895738e0b06091f0-f508768968f50b46-full-play.gif">
+      </a>
+    </div>
 
 
 Configuring the Robusta UI Sink
 ------------------------------------------------
 
+.. tip::
+    This guide is for users who have already installed Robusta on their cluster. If you haven't installed Robusta yet, we recommend starting by `creating a free Robusta UI account ↗ <https://platform.robusta.dev/signup?utm_source=docs&utm_content=robusta-ui-sink-page>`_ instead.
+
 Use the ``robusta`` CLI to generate a token:
 
 .. code-block::
    :name: cb-robusta-ui-sink-generate-token
 
     robusta integrations ui
 
-Add a new sink to your Helm values, under ``sinksConfig``, with the token you generated:
+Add a new sink to your Helm values (``generated_values.yaml``), under ``sinksConfig``, with the token you generated:
 
-.. admonition:: Add this to your generated_values.yaml
-
-    .. code-block:: bash
-      :name: cb-robusta-ui-sink-config
+.. code-block:: bash
+  :name: cb-robusta-ui-sink-config
 
-        sinksConfig:
-        - robusta_sink:
-            name: robusta_ui_sink
-            token: <your-token>
-            ttl_hours: 4380
+  sinksConfig:
+  - robusta_sink:
+      name: robusta_ui_sink
+      token: <your-token>
+      ttl_hours: 4380
 
 Perform a :ref:`Helm Upgrade <Simple Upgrade>`.
 

diff --git a/docs/tutorials/alert-builtin-enrichment.rst → ...how-it-works/alert-builtin-enrichment.rst b/docs/tutorials/alert-builtin-enrichment.rst → ...how-it-works/alert-builtin-enrichment.rst
diff --git a/docs/images/robusta_ui_loom_preview.gif b/docs/images/robusta_ui_loom_preview.gif
diff --git a/docs/index.rst b/docs/index.rst
@@ -17,6 +17,7 @@
    how-it-works/oss-vs-saas
    how-it-works/coverage
    how-it-works/usage-faq
+   how-it-works/alert-builtin-enrichment
 
 .. toctree::
    :maxdepth: 4
@@ -57,13 +58,6 @@
 
    playbook-reference/index
 
-.. toctree::
-   :maxdepth: 4
-   :caption: 🎓 Tutorials
-   :hidden:
-
-   tutorials/index
-
 .. toctree::
    :maxdepth: 4
    :caption: Help

diff --git a/docs/setup-robusta/index.rst b/docs/setup-robusta/index.rst
@@ -16,6 +16,7 @@
    multi-cluster
    upgrade
    configuration-secrets
+   robusta-runner-metrics
    supported-clusters
    openshift
    node-selector
@@ -24,4 +25,5 @@
    alertsui
    additional-settings
    installation-faq
+
 
diff --git a/docs/setup-robusta/installation/_generate_config.jinja b/docs/setup-robusta/installation/_generate_config.jinja
@@ -10,7 +10,7 @@ Choose a configuration method below:
     .. tab-item:: Web Installation (recommended)
         :name: web-installation-tab
 
-        Create the configuration by signing up `for a free Robusta UI account ↗ <https://platform.robusta.dev/signup?utm_source=docs>`_
+        Create the configuration by signing up `for a free Robusta UI account ↗ <https://platform.robusta.dev/signup?utm_source=docs&utm_content=install-page>`_
 
         .. note::
 

diff --git a/docs/setup-robusta/installation/index.rst b/docs/setup-robusta/installation/index.rst
@@ -15,6 +15,7 @@ Installation Guides
    extend-prometheus-installation
    standalone-installation
    dev-setup
+
 
 
 .. grid:: 1 1 2 2

diff --git a/docs/tutorials/robusta-runner-metrics.rst → .../setup-robusta/robusta-runner-metrics.rst b/docs/tutorials/robusta-runner-metrics.rst → .../setup-robusta/robusta-runner-metrics.rst
@@ -1,4 +1,4 @@
-Monitoring Robusta with Prometheus
+Self-Monitoring
 ======================================
 
 Robusta Metrics Graphs

diff --git a/docs/tutorials/_routing-further-reading.rst b/docs/tutorials/_routing-further-reading.rst
diff --git a/docs/tutorials/application-troubleshooting-java.rst b/docs/tutorials/application-troubleshooting-java.rst
diff --git a/docs/tutorials/grafana-annotations.rst b/docs/tutorials/grafana-annotations.rst
diff --git a/docs/tutorials/index.rst b/docs/tutorials/index.rst