Skip to content

Commit e5766a0

Browse files
committed
Merge branch 'master' into stream-actions
2 parents 7e319a4 + 305302c commit e5766a0

5 files changed

Lines changed: 18 additions & 7 deletions

File tree

docs/configuration/holmesgpt/toolsets/grafana.rst

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ from your Grafana instance.
2323
enabled: true
2424
config:
2525
api_key: <your grafana API key>
26-
url: https://grafana-url
26+
url: https://xxxxxxx.grafana.net # Your Grafana cloud account URL
2727
2828
You can optionally tweak the search terms used by the toolset. This is only needed if your Loki logs settings for pod,
2929
namespace and node differ from the defaults listed below. To do so, add these search keys to the configuration:
@@ -36,7 +36,7 @@ namespace and node differ from the defaults listed below. To do so, add these se
3636
enabled: true
3737
config:
3838
api_key: <your grafana API key>
39-
url: https://grafana-url
39+
url: https://xxxxxxx.grafana.net # Your Grafana cloud account URL
4040
pod_name_search_key: "pod"
4141
namespace_search_key: "namespace"
4242
node_name_search_key: "node"
@@ -86,7 +86,7 @@ your Grafana instance.
8686
enabled: true
8787
config:
8888
api_key: <your grafana API key>
89-
url: https://grafana-url
89+
url: https://xxxxxxx.grafana.net # Your Grafana cloud account URL
9090
9191
.. include:: ./_toolset_configuration.inc.rst
9292

@@ -106,3 +106,13 @@ Capabilities
106106
- Lists Tempo traces ids that exceed a specified minimum duration in a given time range
107107
* - fetch_tempo_trace_by_id
108108
- Retrieves detailed information about a Tempo trace using its trace ID. Use this to investigate a trace.
109+
110+
111+
Getting Grafana URL
112+
-----------------------
113+
114+
You can find the Grafana URL required for Loki and Tempo in your Grafana cloud account settings.
115+
116+
.. image:: /images/grafana-url-for-holmes.png
117+
:width: 600
118+
:align: center

docs/configuration/holmesgpt/toolsets/slab.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Slab
22
====
33

44
By enabling this toolset, HolmesGPT will be able to consult runbooks from Slab pages.
5-
Retrieve your Slab `API token <https://help.slab.com/en/articles/6545629-developer-tools-api-webhooks>`_ prior to configuring this toolset.
5+
Retrieve your Slab `API token <https://help.slab.com/en/articles/6545629-developer-tools-api-webhooks>`_ prior to configuring this toolset. Do note that Slab API is only available for Slab premium users. See `here <https://help.slab.com/en/articles/6545629-developer-tools-api-webhooks>`_.
66

77
Configuration
88
-------------
12.9 KB
Loading

helm/robusta/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Note that if the Robusta UI is enabled, telemetry cannot be disabled even if ENA
1212

1313
{{- range .Values.sinksConfig }}
1414
{{if .robusta_sink}}
15-
Visit the web UI at: https://platform.robusta.dev/
15+
Visit the web UI at: https://platform.robusta.dev/check-connection?clusterName={{ $.Values.clusterName }}&account={{ $.Values.globalConfig.account_id }}
1616
{{- end }}
1717
{{- end }}
1818

playbooks/robusta_playbooks/sink_enrichments.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ class OpsGenieLinkParams(ActionParams):
7777
@action
7878
def opsgenie_slack_enricher(alert: PrometheusKubernetesAlert, params: OpsGenieLinkParams):
7979
"""
80-
Adds a button in slack to ack an opsGenie alert
81-
Adds a Link to slack to the alert in opsgenie
80+
Adds buttons to Robusta alerts in Slack for OpsGenie users:
81+
1. A button to acknowledge OpsGenie alerts from Robusta alerts
82+
2. A button to view Robusta alerts in OpsGenie (finds the relevant alert in OpsGenie and takes you there)
8283
"""
8384
normalized_url_base = normalize_url_base(params.url_base)
8485
alert.add_link(

0 commit comments

Comments
 (0)