Merge branch 'master' into ingress-change-tracking-bug

robusta-dev · Jan 26, 2025 · 2535465 · 2535465
2 parents fa0da30 + ad1950b
commit 2535465
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -52,10 +52,25 @@ Robusta is installed with Helm. For convenience, we provide a CLI wizard to gene
 
 You can install Robusta alongside your existing Prometheus, or as an all-in-one bundle with Robusta and a preconfigured `kube-prometheus-stack`.
 
+To get *even more* out of Robusta, we recommend creating [a free Robusta UI account](#-free-robusta-ui). Learn more below.
+
+[Create a free Robusta UI account »](https://platform.robusta.dev/signup?utm_source=github&utm_medium=robusta-readme&utm_content=installing_robusta_section)
+
 [Installation instructions »](https://docs.robusta.dev/master/setup-robusta/installation/index.html)
 
 <!-- <p align="right">(<a href="#top">back to top</a>)</p> -->
 
+## 🖥 Free Robusta UI
+Take your Kubernetes monitoring to the next level with the [Robusta SaaS platform](https://platform.robusta.dev/signup?utm_source=github&utm_medium=robusta-readme&utm_content=free_robusta_ui_section). Creating an account is free, and includes:
+
+- **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
+
+  <a href="https://www.loom.com/share/89c7e098d9494d79895738e0b06091f0">
+      <img src="https://cdn.loom.com/sessions/thumbnails/89c7e098d9494d79895738e0b06091f0-f508768968f50b46-full-play.gif">
+  </a>
+
 ## 📝 Documentation
 Interested? Learn more about Robusta.
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -114,9 +114,8 @@
     "tutorials/playbook-track-secrets.html": "/master/playbook-reference/kubernetes-examples//playbook-track-secrets.html",
     "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"
-
-
+    "catalog/sinks/slack.html": "/master/configuration/sinks/slack.html",
+    "user-guide/sinks-configuration.html": "master/notification-routing/routing-with-scopes.html"
 }
 
 

diff --git a/docs/configuration/index.rst b/docs/configuration/index.rst
@@ -26,7 +26,7 @@ Robusta can receive alerts from many sources and send them to many destinations.
 
     .. grid-item-card:: :octicon:`book;1em;` Sinks (Destinations)
         :class-card: sd-bg-light sd-bg-text-light
-        :link: configuring-sinks
+        :link: sinks/index
         :link-type: doc
 
         Send notifications from Robusta to 15+ integrations like Slack, MS Teams, and Email.

diff --git a/docs/help.rst b/docs/help.rst
@@ -257,8 +257,8 @@ CRD issues
       This is often a CRD issue which can be fixed by enabling server-side apply option as shown below. Check out `this blog <https://blog.ediri.io/kube-prometheus-stack-and-argocd-25-server-side-apply-to-the-rescue>`_ to learn more. 
 
       .. image:: /images/Argocd_crd_issue_fix.png 
-      :width: 400
-      :align: center
+        :width: 400
+        :align: center
 
 .. details:: one or more objects failed to apply... CustomResourceDefinition.apiextensions.k8s.io "prometheusagents.monitoring.coreos.com" is invalid
 

diff --git a/docs/notification-routing/disable-oomkill-notifications.rst b/docs/notification-routing/disable-oomkill-notifications.rst
@@ -0,0 +1,11 @@
+Disable "OOMKill" Notifications
+===================================
+
+Configure Robusta to not send OOMKill notifications by disabling the built-in OOMKill playbook. 
+
+.. code-block:: yaml
+
+    disabledPlaybooks:
+    - PodOOMKill
+
+Similarly you can to disable any built-in notification using the name of the playbook. Find all the built-in playbooks `here <https://github.com/robusta-dev/robusta/blob/master/helm/robusta/values.yaml#L113>`_ and `here <https://github.com/robusta-dev/robusta/blob/master/helm/robusta/values.yaml#L169>`_
diff --git a/docs/notification-routing/excluding-resolved.rst b/docs/notification-routing/excluding-resolved.rst
@@ -0,0 +1,15 @@
+Exclude "Resolved" Notifications
+===================================
+
+Configure Robusta to not send notifications for issues that are resolved. This helps you reduce noise and focus on just firing alerts 
+
+.. code-block:: yaml
+
+    sinksConfig:
+    - slack_sink:
+        name: high_severity_sink
+        slack_channel: high-severity-notifications
+        api_key: secret-key
+        scope:
+        exclude:
+            - title: ".*[RESOLVED].*"
diff --git a/docs/notification-routing/notification-routing-examples.rst b/docs/notification-routing/notification-routing-examples.rst
@@ -11,5 +11,7 @@ Routing Cookbook
    routing-to-multiple-slack-channels
    routing-exclusion
    routing-by-severity
+   excluding-resolved
+   disable-oomkill-notifications
 
 In this section you'll find example configurations for common routing patterns.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,8 +29,8 @@ supabase = "^2.4"
 tabulate = { version = "^0.8.10" }
 slack-sdk = { version = "^3.23.0" }
 Flask = { version = "^3.0.0", optional = true }
-werkzeug = { version = ">=3.0.3", optional = true }
-jinja2 = { version = ">=3.1.4", optional = true }
+werkzeug = { version = ">=3.0.6", optional = true }
+jinja2 = { version = ">=3.1.5", optional = true }
 grafana-api = { version = "^1.0.3", optional = true }
 watchdog =  { version = "^2.1.0", optional = true }
 better-exceptions = { version =  "^0.3.3", optional = true }