From 105462bb5d17468daabe0470a16eaac585b01b78 Mon Sep 17 00:00:00 2001
From: Alexander Werner <alexander.werner@mawoh.de>
Date: Mon, 3 Dec 2018 17:40:59 +0100
Subject: [PATCH 1/2] monit: Support declaring dependencies

---
 .../controllers/OPNsense/Monit/forms/services.xml    |  6 ++++++
 src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml | 12 ++++++++++++
 src/opnsense/mvc/app/views/OPNsense/Monit/index.volt |  2 ++
 .../service/templates/OPNsense/Monit/monitrc         |  6 ++++++
 4 files changed, 26 insertions(+)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
index 5b2b44c1a..d902b8e16 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
@@ -72,6 +72,12 @@
       <type>select_multiple</type>
       <help><![CDATA[This is a list with service tests.]]></help>
    </field>
+   <field>
+      <id>monit.service.depends</id>
+      <label>Depends</label>
+      <type>select_multiple</type>
+      <help><![CDATA[This is a list with service dependencies.]]></help>
+   </field>
    <field>
       <id>monit.service.description</id>
       <label>Description</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
index 8e0e192ca..9997a06e2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
@@ -256,6 +256,18 @@
             <multiple>Y</multiple>
             <Required>N</Required>
          </tests>
+         <depends type="ModelRelationField">
+            <Model>
+               <template>
+                  <source>OPNsense.monit.monit</source>
+                  <items>service</items>
+                  <display>name</display>
+               </template>
+            </Model>
+            <ValidationMessage>Related item not found</ValidationMessage>
+            <multiple>Y</multiple>
+            <Required>N</Required>
+         </depends>
       </service>
       <test type="ArrayField">
          <name type="TextField">
diff --git a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
index 184d2bd2f..c7febc420 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
@@ -201,6 +201,7 @@ POSSIBILITY OF SUCH DAMAGE.
          $('tr[id="row_monit.service.interface"]').addClass('hidden');
          $('tr[id="row_monit.service.start"]').removeClass('hidden');
          $('tr[id="row_monit.service.stop"]').removeClass('hidden');
+         $('tr[id="row_monit.service.depends"]').removeClass('hidden');
          switch (servicetype) {
             case 'process':
                var pidfile = $('#monit\\.service\\.pidfile').val();
@@ -236,6 +237,7 @@ POSSIBILITY OF SUCH DAMAGE.
             case 'system':
                $('tr[id="row_monit.service.start"]').addClass('hidden');
                $('tr[id="row_monit.service.stop"]').addClass('hidden');
+               $('tr[id="row_monit.service.depends"]').addClass('hidden');
                break;
             default:
                $('tr[id="row_monit.service.path"]').removeClass('hidden');
diff --git a/src/opnsense/service/templates/OPNsense/Monit/monitrc b/src/opnsense/service/templates/OPNsense/Monit/monitrc
index bfb66e185..26fe3b8a0 100644
--- a/src/opnsense/service/templates/OPNsense/Monit/monitrc
+++ b/src/opnsense/service/templates/OPNsense/Monit/monitrc
@@ -128,6 +128,12 @@ check program {{ service.name }} {{ path }} {{ timeout }}
 check {{ service.type }} {{ service.name }} {{ path }}
 {%      endif %}
 {%     endif %}
+{%     if service.depends is defined %}
+{%      for dependency in service.depends.split(",") %}
+{%      set dependency = helpers.getUUID(dependency) %}
+   depends on {{dependency.name}}
+{%      endfor %}
+{%     endif %}
 {%     if service.start|default('') != '' %}
    start program = "{{ service.start }}"
 {%     endif %}

From 8ad3b9d1a2437a9619524f6d3cb28694672ebc58 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 16 Jan 2019 10:30:51 +0100
Subject: [PATCH 2/2] Monit, clarify help message a bit. for
 https://github.com/opnsense/core/pull/3001

---
 .../mvc/app/controllers/OPNsense/Monit/forms/services.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
index d902b8e16..30c65eaf9 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
@@ -76,7 +76,7 @@
       <id>monit.service.depends</id>
       <label>Depends</label>
       <type>select_multiple</type>
-      <help><![CDATA[This is a list with service dependencies.]]></help>
+      <help><![CDATA[Optionally define a (list of) service(s) which are required before monitoring this one, if any of the dependencies are either stopped or unmonitored this service will stop/unmonitor too.]]></help>
    </field>
    <field>
       <id>monit.service.description</id>