From 0fdaa01937fa387a1457eec4648396ec2c3f7d38 Mon Sep 17 00:00:00 2001 From: "Kostis (Codefresh)" <39800303+kostis-codefresh@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:04:08 +0000 Subject: [PATCH 1/2] fixed conflicts Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> Empty line Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --- docs/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 57cb8cd..7e9ca23 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,8 @@ !!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/). Redirecting to the new page. + Warning. Argo notifications has been merged with the Argo CD project. You do not need to install it separately anymore. It is now part of the main Argo CD installation See https://argo-cd.readthedocs.io/en/stable/operator-manual/notifications/ for latest docs. + # Overview From fc561d084851e313673042e227de8ac9f8c49d00 Mon Sep 17 00:00:00 2001 From: "Kostis (Codefresh)" <39800303+kostis-codefresh@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:07:43 +0000 Subject: [PATCH 2/2] Run make generate Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --- docs/catalog.md | 5 ----- docs/services/alertmanager.md | 5 ----- docs/services/email.md | 5 ----- docs/services/github.md | 5 ----- docs/services/googlechat.md | 5 ----- docs/services/grafana.md | 5 ----- docs/services/mattermost.md | 5 ----- docs/services/opsgenie.md | 5 ----- docs/services/overview.md | 5 ----- docs/services/pushover.md | 5 ----- docs/services/rocketchat.md | 5 ----- docs/services/slack.md | 5 ----- docs/services/teams.md | 5 ----- docs/services/telegram.md | 5 ----- docs/services/webhook.md | 5 ----- docs/troubleshooting-commands.md | 5 ----- 16 files changed, 80 deletions(-) diff --git a/docs/catalog.md b/docs/catalog.md index 7161d34..2a66322 100644 --- a/docs/catalog.md +++ b/docs/catalog.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/catalog//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/catalog//). Redirecting to the new page. - # Triggers and Templates Catalog ## Triggers | NAME | DESCRIPTION | TEMPLATE | diff --git a/docs/services/alertmanager.md b/docs/services/alertmanager.md index dc982d2..e0f9d7e 100644 --- a/docs/services/alertmanager.md +++ b/docs/services/alertmanager.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/alertmanager//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/alertmanager//). Redirecting to the new page. - # Alertmanager ## Parameters diff --git a/docs/services/email.md b/docs/services/email.md index 6679c1d..e3c4b7d 100644 --- a/docs/services/email.md +++ b/docs/services/email.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/email//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/email//). Redirecting to the new page. - # Email ## Parameters diff --git a/docs/services/github.md b/docs/services/github.md index 80c5765..953e55b 100644 --- a/docs/services/github.md +++ b/docs/services/github.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/github//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/github//). Redirecting to the new page. - # GitHub ## Parameters diff --git a/docs/services/googlechat.md b/docs/services/googlechat.md index 9d03ade..0448469 100644 --- a/docs/services/googlechat.md +++ b/docs/services/googlechat.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/googlechat//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/googlechat//). Redirecting to the new page. - # Google Chat ## Parameters diff --git a/docs/services/grafana.md b/docs/services/grafana.md index 8f9aeef..ff567b7 100644 --- a/docs/services/grafana.md +++ b/docs/services/grafana.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/grafana//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/grafana//). Redirecting to the new page. - # Grafana To be able to create Grafana annotation with argocd-notifications you have to create an [API Key](https://grafana.com/docs/grafana/latest/http_api/auth/#create-api-key) inside your [Grafana](https://grafana.com). diff --git a/docs/services/mattermost.md b/docs/services/mattermost.md index c98b681..98e0d0f 100644 --- a/docs/services/mattermost.md +++ b/docs/services/mattermost.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/mattermost//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/mattermost//). Redirecting to the new page. - # Mattermost ## Parameters diff --git a/docs/services/opsgenie.md b/docs/services/opsgenie.md index 12ee182..665d008 100644 --- a/docs/services/opsgenie.md +++ b/docs/services/opsgenie.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/opsgenie//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/opsgenie//). Redirecting to the new page. - # Opsgenie To be able to send notifications with argocd-notifications you have to create an [API Integration](https://docs.opsgenie.com/docs/integrations-overview) inside your [Opsgenie Team](https://docs.opsgenie.com/docs/teams). diff --git a/docs/services/overview.md b/docs/services/overview.md index f2296f1..15e674f 100644 --- a/docs/services/overview.md +++ b/docs/services/overview.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/overview//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/overview//). Redirecting to the new page. - The notification services represent integration with services such as slack, email or custom webhook. Services are configured in `argocd-notifications-cm` ConfigMap using `service..()` keys and might reference sensitive data from `argocd-notifications-secret` Secret. Following example demonstrates slack service configuration: diff --git a/docs/services/pushover.md b/docs/services/pushover.md index 201a3ab..37cb20b 100644 --- a/docs/services/pushover.md +++ b/docs/services/pushover.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/pushover//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/pushover//). Redirecting to the new page. - # Pushover 1. Create an app at [pushover.net](https://pushover.net/apps/build). diff --git a/docs/services/rocketchat.md b/docs/services/rocketchat.md index 54c6aab..554f42a 100644 --- a/docs/services/rocketchat.md +++ b/docs/services/rocketchat.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/rocketchat//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/rocketchat//). Redirecting to the new page. - # Rocket.Chat ## Parameters diff --git a/docs/services/slack.md b/docs/services/slack.md index 21af354..6119a32 100644 --- a/docs/services/slack.md +++ b/docs/services/slack.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/slack//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/slack//). Redirecting to the new page. - # Slack If you want to send message using incoming webhook, you can use [webhook](./webhook.md#send-slack). diff --git a/docs/services/teams.md b/docs/services/teams.md index 6287e55..eb50f55 100644 --- a/docs/services/teams.md +++ b/docs/services/teams.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/teams//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/teams//). Redirecting to the new page. - # Teams ## Parameters diff --git a/docs/services/telegram.md b/docs/services/telegram.md index b720e03..953c2a9 100644 --- a/docs/services/telegram.md +++ b/docs/services/telegram.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/telegram//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/telegram//). Redirecting to the new page. - # Telegram 1. Get an API token using [@Botfather](https://t.me/Botfather). diff --git a/docs/services/webhook.md b/docs/services/webhook.md index fdc5b3d..b6aee1e 100644 --- a/docs/services/webhook.md +++ b/docs/services/webhook.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/webhook//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/services/webhook//). Redirecting to the new page. - ## Configuration The webhook notification service allows sending a generic HTTP request using the templatized request body and URL. diff --git a/docs/troubleshooting-commands.md b/docs/troubleshooting-commands.md index ca1105e..42b89c7 100644 --- a/docs/troubleshooting-commands.md +++ b/docs/troubleshooting-commands.md @@ -1,8 +1,3 @@ - - -!!! important "This page has moved" - This page has moved to [https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/troubleshooting-commands//](https://argo-cd.readthedocs.io/en/latest/operator-manual/notifications/troubleshooting-commands//). Redirecting to the new page. - ## argocd-notifications template get Prints information about configured templates