Commit 521c06ee authored by Alex's avatar Alex

Aktualisieren xmpp-service-notification.py, xmpp-host-notification.py Dateien

parent 1029956e
Pipeline #1755 failed with stage
in 1 minute and 47 seconds
......@@ -87,8 +87,7 @@ def get_params(d, l, n, o, r, s, t, u, p, i, b, c, ip4, ip6):
jid = aioxmpp.JID.fromstr(u)
rjid = aioxmpp.JID.fromstr(r)
msg = ("***** Host Monitoring auf " + socket.gethostname() + " *****" + "\n\n"
+ t + " Host " + n + " ist " + s + "!\n\n"
msg = (t + " Host " + n + " ist " + s + "!\n\n"
+ "Info: " + o + "\n\n"
+ "Wann: " + d + "\n"
+ "Host: " + l + "\n")
......@@ -108,6 +107,8 @@ def get_params(d, l, n, o, r, s, t, u, p, i, b, c, ip4, ip6):
msg = (msg + "\n"
+ i + "/monitoring/host/show?host=" + urllib.parse.quote_plus(l))
msg = (msg + "\n\n" + "***** Host Monitoring auf " + socket.gethostname() + " *****")
xmpphandler = XMPPHandler(rjid, jid, p)
xmpphandler.set_message(msg)
......
......@@ -89,8 +89,7 @@ def get_params(d, e, l, n, o, r, s, t, z, u, p, i, b, c, ip4, ip6):
jid = aioxmpp.JID.fromstr(u)
rjid = aioxmpp.JID.fromstr(r)
msg = ("***** Service Monitoring auf " + socket.gethostname() + " *****" + "\n\n"
+ "[" + t + "] " + z + " auf " + n + " ist " + s + "!\n\n"
msg = ("[" + t + "] " + z + " auf " + n + " ist " + s + "!\n\n"
+ "Info: " + o + "\n\n"
+ "Wann: " + d + "\n"
+ "Service: " + e + "\n"
......@@ -111,6 +110,8 @@ def get_params(d, e, l, n, o, r, s, t, z, u, p, i, b, c, ip4, ip6):
msg = (msg + "\n"
+ i + "/monitoring/service/show?host=" + urllib.parse.quote_plus(l) + "&service=" + urllib.parse.quote_plus(e))
msg = (msg + "\n\n" + "***** Service Monitoring auf " + socket.gethostname() + " *****")
xmpphandler = XMPPHandler(rjid, jid, p)
xmpphandler.set_message(msg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment