Merge pull request #64 from Icinga/feature/add-duedate

Feature/add duedate

closes #37

README.md

@@ -31,6 +31,7 @@ Changes
 * FIX: we're sending Content-Length to make proxies happy (#51)
 * FEATURE: Show status for created issues (#44)
 * FEATURE: Allow choosing a default template (#36)
+* FEATURE: Add configurable duedate for created JIRA issues (#37)
 
 ### v1.0.1
 

application/clicommands/SendCommand.php

@@ -34,6 +34,8 @@ class SendCommand extends Command
      * OPTIONAL
      *
      *   --service <service-name>   Icinga Service name
+     *   --due-date <due-date>        When the Jira ticket is to be due.
+     *                              It can be a date  or time difference in textual datetime format.
      *   --template <template-name> Template name (templates.ini section)
      *   --ack-author <author>      Username shown for acknowledgements,
      *                              defaults to "JIRA"
@@ -57,6 +59,7 @@ public function problemAction()
         $ackPipe     = $p->shift('command-pipe');
         $status      = $p->shiftRequired('state');
         $description = $p->shiftRequired('description');
+        $duedate     = $p->shift('due-date');
 
         $jira = $this->jira();
         $issue = $jira->eventuallyGetLatestOpenIssueFor($host, $service);
@@ -74,6 +77,7 @@ public function problemAction()
                 'state'       => $status,
                 'host'        => $host,
                 'service'     => $service,
+                'duedate'     => $duedate
             ] + $p->getParams();
 
             $template = new IssueTemplate();
@@ -83,6 +87,9 @@ public function problemAction()
             $info = new MonitoringInfo($host, $service);
             $info->setNotificationType('PROBLEM'); // TODO: Once passed, we could deal with RECOVERY
             $template->setMonitoringInfo($info);
+            if (! empty($duedate)) {
+                $template->addFields(['duedate' => $duedate]);
+            }
 
             $key = $jira->createIssue($template->getFilled($params));
 

doc/03-Configuration.md

@@ -162,6 +162,7 @@ SearchCategory = "CI"
 SearchTerm = "${host}.example.com"
 Activity.value = "proactive"
 customfield_1232 = "Icinga"
+duedate = "3 days"
 ```
 
 Pass `my-workflow` to your NotificationCommand through the `--template` parameter

library/Jira/IssueTemplate.php

@@ -15,7 +15,11 @@ public function getFilled($params)
     {
         $fields = [];
         foreach ($this->getUnfilledFields() as $key => $tpl) {
-            $this->addToFields($fields, $key, $this->fillTemplate($tpl, $params));
+            if ($key === 'duedate') {
+                $fields['duedate'] = date('Y-m-d', strtotime($tpl));
+            } else {
+                $this->addToFields($fields, $key, $this->fillTemplate($tpl, $params));
+            }
         }
 
         if (isset($fields['description'])) {

library/Jira/RestApi.php

@@ -177,6 +177,7 @@ public function fetchIssues($host = null, $service = null, $onlyOpen = true)
             'summary',
             'status',
             'created',
+            'duedate',
             'icingaStatus',
             'icingaKey',
         ];