From 6ebe9527ee57f6c2358861e7e269e8399a7f9b8b Mon Sep 17 00:00:00 2001
From: JuanCarlos <juanca.romo9@gmail.com>
Date: Thu, 14 Feb 2019 09:18:05 +0100
Subject: [PATCH] Edit interval from settings

---
 .../settings/settings-configuration.html      | 19 ++++++++++---------
 server/lib/update-configuration.js            |  1 +
 server/monitoring.js                          |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/public/templates/settings/settings-configuration.html b/public/templates/settings/settings-configuration.html
index f206a33d4..3a70fceca 100644
--- a/public/templates/settings/settings-configuration.html
+++ b/public/templates/settings/settings-configuration.html
@@ -32,18 +32,19 @@
                                 ng-style="ctrl.editingKey === key && {'background': '#e2f7ff'}">
                                 <td>{{key}}</td>
                                 <td>
-                                    <input ng-if="ctrl.editingKey === key && ctrl.configurationTypes[key] === 'string'"
-                                        ng-disabled="ctrl.loadingChange" id="input-{{key}}" type="text" class="wz-input-text"
-                                        ng-model="ctrl.editingNewValue"></input>
+                                    <input ng-if="ctrl.editingKey === key && ctrl.configurationTypes[key] === 'string' && key !== 'wazuh.monitoring.creation'"
+                                        ng-disabled="ctrl.loadingChange" type="text" class="wz-input-text" ng-model="ctrl.editingNewValue"></input>
                                     <input ng-if="ctrl.editingKey === key && ctrl.configurationTypes[key] === 'number'"
-                                        ng-disabled="ctrl.loadingChange" id="input-{{key}}" type="number" class="wz-input-text"
-                                        ng-model="ctrl.editingNewValue" min=0></input>
+                                        ng-disabled="ctrl.loadingChange" type="number" class="wz-input-text" ng-model="ctrl.editingNewValue"
+                                        min=0></input>
                                     <select ng-if="ctrl.editingKey === key && ctrl.configurationTypes[key] === 'boolean'"
-                                        ng-disabled="ctrl.loadingChange" id="input-{{key}}" class="wz-input-text wz-width-100"
-                                        ng-model="ctrl.editingNewValue" ng-options="o as o for o in [true, false]"></select>
+                                        ng-disabled="ctrl.loadingChange" class="wz-input-text wz-width-100" ng-model="ctrl.editingNewValue"
+                                        ng-options="o as o for o in [true, false]"></select>
+                                    <select ng-if="ctrl.editingKey === key && key === 'wazuh.monitoring.creation'"
+                                        ng-disabled="ctrl.loadingChange" class="wz-input-text wz-width-100" ng-model="ctrl.editingNewValue"
+                                        ng-options="key as value for (key , value) in  {'h': 'hourly', 'd': 'daily', 'w': 'weekly', 'm': 'monthly'}"></select>
                                     <textarea ng-if="ctrl.editingKey === key && ctrl.configurationTypes[key] === 'object'"
-                                        ng-disabled="ctrl.loadingChange" id="input-{{key}}" class="wz-input-text wz-width-100"
-                                        ng-model="ctrl.editingNewValue"></textarea>
+                                        ng-disabled="ctrl.loadingChange" class="wz-input-text wz-width-100" ng-model="ctrl.editingNewValue"></textarea>
                                     <span ng-show="!ctrl.editingKey || ctrl.editingKey !== key">{{value}}</span>
                                 </td>
                                 <td>{{ctrl.configEquivalence(key)}}</td>
diff --git a/server/lib/update-configuration.js b/server/lib/update-configuration.js
index 50e3f5396..48d60cd7c 100644
--- a/server/lib/update-configuration.js
+++ b/server/lib/update-configuration.js
@@ -23,6 +23,7 @@ const needRestartFields = [
   'wazuh.monitoring.frequency',
   'wazuh.monitoring.shards',
   'wazuh.monitoring.replicas',
+  'wazuh.monitoring.creation',
   'wazuh.monitoring.pattern'
 ];
 export class UpdateConfigurationFile {
diff --git a/server/monitoring.js b/server/monitoring.js
index e06d71086..848cecb04 100644
--- a/server/monitoring.js
+++ b/server/monitoring.js
@@ -634,11 +634,11 @@ export class Monitoring {
       }
 
       !this.quiet &&
-        log('[monitoring][init]', 'Creating today index...', 'info');
+        log('[monitoring][init]', 'Creating new index...', 'info');
       !this.quiet &&
         this.server.log(
           [blueWazuh, 'monitoring', 'info'],
-          'Creating today index...'
+          'Creating new index...'
         );
 
       await this.saveStatus();