Merge pull request #657 from palourde/refactoring-silenced

Silenced refactoring
sensu · Mar 21, 2017 · 5d7927d · 5d7927d
2 parents b32fbc5 + a10d556
commit 5d7927d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/fixtures/users/config_users.json b/fixtures/users/config_users.json
@@ -0,0 +1,7 @@
+{
+  "uchiwa": {
+    "usersOptions": {
+      "silenceDurations": [2]
+    }
+  }
+}
diff --git a/public/index.html b/public/index.html
@@ -17,7 +17,7 @@
   <link href="bower_components/fontawesome/css/font-awesome.min.css?rel=1489178318313" rel="stylesheet">
   <link href="bower_components/angular-toastr/dist/angular-toastr.min.css?rel=1489178318313" rel="stylesheet">
   <link href="bower_components/highlightjs/styles/tomorrow.css?rel=1489178318313" rel="stylesheet">
-  <link href="bower_components/angular-mass-autocomplete-uchiwa/massautocomplete.theme.css?rel=1489178318313" rel="stylesheet">
+  <link href="bower_components/moment-picker/dist/angular-moment-picker.min.css?rel=1489178318312" rel="stylesheet">
 
   <!-- Uchiwa CSS -->
   <link href="bower_components/uchiwa-web/css/uchiwa-default/uchiwa-default.css?rel=1489178318313" rel="stylesheet" site-theme>
@@ -47,9 +47,9 @@ <h3 class="font-bold">We couldn't load Uchiwa configuration.</h3>
 <script src="bower_components/angular-toastr/dist/angular-toastr.tpls.min.js?rel=1489178318312"></script>
 <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js?rel=1489178318312"></script>
 <script src="bower_components/highlightjs/highlight.pack.js?rel=1489178318312"></script>
-<script src="bower_components/angular-mass-autocomplete-uchiwa/massautocomplete.min.js?rel=1489178318312"></script>
 <script src="bower_components/moment/min/moment.min.js?rel=1489178318312"></script>
 <script src="bower_components/angular-moment/angular-moment.min.js?rel=1489178318312"></script>
+<script src="bower_components/moment-picker/dist/angular-moment-picker.min.js?rel=1489178318312"></script>
 <script src="bower_components/angular-gravatar/build/angular-gravatar.min.js?rel=1489178318312"></script>
 <script src="bower_components/ua-parser-js/dist/ua-parser.min.js?rel=1489178318313"></script>
 

diff --git a/uchiwa/config/config.go b/uchiwa/config/config.go
@@ -35,10 +35,10 @@ var (
 		},
 		UsersOptions: UsersOptions{
 			DateFormat:             "YYYY-MM-DD HH:mm:ss",
-			DefaultExpireOnResolve: false,
 			DefaultTheme:           "uchiwa-default",
 			DisableNoExpiration:    false,
 			RequireSilencingReason: false,
+			SilenceDurations:       []float32{0.25, 1, 24},
 		},
 	}
 	defaultSensuConfig = SensuConfig{
@@ -250,6 +250,7 @@ func initUchiwa(global GlobalConfig) GlobalConfig {
 	// Set the logger level
 	logger.SetLogLevel(global.LogLevel)
 
+	// Initialize the users options
 	// Set the refresh rate for frontend
 	global.UsersOptions.Refresh = global.Refresh * 1000
 

diff --git a/uchiwa/config/config_test.go b/uchiwa/config/config_test.go
@@ -14,11 +14,9 @@ func TestLoad(t *testing.T) {
 	assert.Equal(t, 10, conf.Sensu[0].Timeout)
 	assert.Equal(t, 10, conf.Uchiwa.Refresh)
 	assert.Equal(t, "YYYY-MM-DD HH:mm:ss", conf.Uchiwa.UsersOptions.DateFormat)
-	assert.Equal(t, false, conf.Uchiwa.UsersOptions.DefaultExpireOnResolve)
 	assert.Equal(t, "uchiwa-default", conf.Uchiwa.UsersOptions.DefaultTheme)
 	assert.Equal(t, false, conf.Uchiwa.UsersOptions.DisableNoExpiration)
 	assert.Equal(t, "", conf.Uchiwa.UsersOptions.LogoURL)
-	assert.Equal(t, 10000, conf.Uchiwa.UsersOptions.Refresh)
 	assert.Equal(t, false, conf.Uchiwa.UsersOptions.RequireSilencingReason)
 	assert.Equal(t, 389, conf.Uchiwa.Ldap.Port)
 	assert.Equal(t, "person", conf.Uchiwa.Ldap.UserObjectClass)
@@ -168,3 +166,9 @@ func TestGetPublic(t *testing.T) {
 	assert.Equal(t, "*****", pubConf.Uchiwa.Github.ClientSecret)
 	assert.Equal(t, "*****", pubConf.Uchiwa.Ldap.BindPass)
 }
+
+func TestUsersOptions(t *testing.T) {
+	// The SilenceDurations default value should be overwritten
+	conf := Load("../../fixtures/config_test.json", "../../fixtures/users")
+	assert.Equal(t, 4, len(conf.Uchiwa.UsersOptions.SilenceDurations))
+}
diff --git a/uchiwa/config/structs.go b/uchiwa/config/structs.go
@@ -115,10 +115,10 @@ type SSL struct {
 // UsersOptions struct contains various config tweaks
 type UsersOptions struct {
 	DateFormat             string
-	DefaultExpireOnResolve bool
 	DefaultTheme           string
 	DisableNoExpiration    bool
 	LogoURL                string
 	Refresh                int
 	RequireSilencingReason bool
+	SilenceDurations       []float32
 }
diff --git a/uchiwa/server.go b/uchiwa/server.go
@@ -988,7 +988,7 @@ func (u *Uchiwa) silencedHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		if u.Config.Uchiwa.UsersOptions.DisableNoExpiration && data.Expire < 1 {
+		if u.Config.Uchiwa.UsersOptions.DisableNoExpiration && (data.Expire < 1 && !data.ExpireOnResolve) {
 			http.Error(w, "Open-ended silence entries are disallowed", http.StatusNotFound)
 			return
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     			return
     		}
-    		if u.Config.Uchiwa.UsersOptions.DisableNoExpiration && data.Expire < 1 {
+    		if u.Config.Uchiwa.UsersOptions.DisableNoExpiration && (data.Expire < 1 && !data.ExpireOnResolve) {
     			http.Error(w, "Open-ended silence entries are disallowed", http.StatusNotFound)
     			return
     		}
@@ Expand Down @@