harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

Project code in URL for the "Add OpsGenie" page. cc: #336

Browse Source
This commit is contained in:
Pēteris Caune 2020-02-21 15:03:26 +02:00
parent d0b77febbc
commit a6d497b21e
No known key found for this signature in database
GPG Key ID: E28D7679E9A9EDE2
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hc/front/tests/test_add_opsgenie.py
View File

@ -5,7 +5,9 @@ from hc.test import BaseTestCase
class AddOpsGenieTestCase(BaseTestCase): class AddOpsGenieTestCase(BaseTestCase):
url = "/integrations/add_opsgenie/" def setUp(self):
super(AddOpsGenieTestCase, self).setUp()
self.url = "/projects/%s/add_opsgenie/" % self.project.code
def test_instructions_work(self): def test_instructions_work(self):
self.client.login(username="alice@example.org", password="password") self.client.login(username="alice@example.org", password="password")
@ -17,7 +19,7 @@ class AddOpsGenieTestCase(BaseTestCase):
self.client.login(username="alice@example.org", password="password") self.client.login(username="alice@example.org", password="password")
r = self.client.post(self.url, form) r = self.client.post(self.url, form)
self.assertRedirects(r, "/integrations/") self.assertRedirects(r, self.channels_url)
c = Channel.objects.get() c = Channel.objects.get()
self.assertEqual(c.kind, "opsgenie") self.assertEqual(c.kind, "opsgenie")
@ -41,7 +43,7 @@ class AddOpsGenieTestCase(BaseTestCase):
form = {"key": "123456", "region": "eu"} form = {"key": "123456", "region": "eu"}
self.client.login(username="alice@example.org", password="password") self.client.login(username="alice@example.org", password="password")
r = self.client.post(self.url, form) self.client.post(self.url, form)
c = Channel.objects.get() c = Channel.objects.get()
payload = json.loads(c.value) payload = json.loads(c.value)

2
hc/front/urls.py
View File

@ -35,7 +35,6 @@ channel_urls = [
path("add_pushbullet/", views.add_pushbullet, name="hc-add-pushbullet"), path("add_pushbullet/", views.add_pushbullet, name="hc-add-pushbullet"),
path("add_discord/", views.add_discord, name="hc-add-discord"), path("add_discord/", views.add_discord, name="hc-add-discord"),
path("add_pushover/", views.add_pushover, name="hc-add-pushover"), path("add_pushover/", views.add_pushover, name="hc-add-pushover"),
path("add_opsgenie/", views.add_opsgenie, name="hc-add-opsgenie"),
path("add_victorops/", views.add_victorops, name="hc-add-victorops"), path("add_victorops/", views.add_victorops, name="hc-add-victorops"),
path("telegram/bot/", views.telegram_bot, name="hc-telegram-webhook"), path("telegram/bot/", views.telegram_bot, name="hc-telegram-webhook"),
path("add_telegram/", views.add_telegram, name="hc-add-telegram"), path("add_telegram/", views.add_telegram, name="hc-add-telegram"),
@ -64,6 +63,7 @@ project_urls = [
path("add_matrix/", views.add_matrix, name="hc-add-matrix"), path("add_matrix/", views.add_matrix, name="hc-add-matrix"),
path("add_mattermost/", views.add_mattermost, name="hc-add-mattermost"), path("add_mattermost/", views.add_mattermost, name="hc-add-mattermost"),
path("add_msteams/", views.add_msteams, name="hc-add-msteams"), path("add_msteams/", views.add_msteams, name="hc-add-msteams"),
path("add_opsgenie/", views.add_opsgenie, name="hc-add-opsgenie"),
path("add_webhook/", views.add_webhook, name="hc-add-webhook"), path("add_webhook/", views.add_webhook, name="hc-add-webhook"),
path("badges/", views.badges, name="hc-badges"), path("badges/", views.badges, name="hc-badges"),
path("checks/", views.my_checks, name="hc-checks"), path("checks/", views.my_checks, name="hc-checks"),

10
hc/front/views.py
View File

@ -1270,21 +1270,23 @@ def add_pushover(request):
@login_required @login_required
def add_opsgenie(request): def add_opsgenie(request, code):
project = _get_project_for_user(request, code)
if request.method == "POST": if request.method == "POST":
form = AddOpsGenieForm(request.POST) form = AddOpsGenieForm(request.POST)
if form.is_valid(): if form.is_valid():
channel = Channel(project=request.project, kind="opsgenie") channel = Channel(project=project, kind="opsgenie")
v = {"region": form.cleaned_data["region"], "key": form.cleaned_data["key"]} v = {"region": form.cleaned_data["region"], "key": form.cleaned_data["key"]}
channel.value = json.dumps(v) channel.value = json.dumps(v)
channel.save() channel.save()
channel.assign_all_checks() channel.assign_all_checks()
return redirect("hc-channels") return redirect("hc-p-channels", project.code)
else: else:
form = AddOpsGenieForm() form = AddOpsGenieForm()
ctx = {"page": "channels", "project": request.project, "form": form} ctx = {"page": "channels", "project": project, "form": form}
return render(request, "integrations/add_opsgenie.html", ctx) return render(request, "integrations/add_opsgenie.html", ctx)

2
templates/front/channels.html
View File

@ -254,7 +254,7 @@
<h2>OpsGenie</h2> <h2>OpsGenie</h2>
<p> Alerting &amp; Incident Management Solution for Dev &amp; Ops.</p> <p> Alerting &amp; Incident Management Solution for Dev &amp; Ops.</p>
<a href="{% url 'hc-add-opsgenie' %}" class="btn btn-primary">Add Integration</a> <a href="{% url 'hc-add-opsgenie' project.code %}" class="btn btn-primary">Add Integration</a>
</li> </li>
<li> <li>

2
templates/integrations/add_opsgenie.html
View File

@ -64,7 +64,7 @@
<h2>Integration Settings</h2> <h2>Integration Settings</h2>
<form method="post" class="form-horizontal" action="{% url 'hc-add-opsgenie' %}"> <form method="post" class="form-horizontal">
{% csrf_token %} {% csrf_token %}
<div class="form-group {{ form.value.css_classes }}"> <div class="form-group {{ form.value.css_classes }}">
<label for="api-key" class="col-sm-2 control-label">API Key</label> <label for="api-key" class="col-sm-2 control-label">API Key</label>