fix: replicas and shards settings (#108)

* fix: shards and replicas

* fix: remove unused error conditon

* fix: exclude system indices from template

Author: lakhansamani

plugins/auth/auth.go

@@ -27,7 +27,7 @@ const (
 	defaultPublicKeyEsIndex   = ".publickey"
 	envJwtRsaPublicKeyLoc     = "JWT_RSA_PUBLIC_KEY_LOC"
 	envJwtRoleKey             = "JWT_ROLE_KEY"
-	settings                  = `{ "settings" : { "number_of_shards" : %d, "number_of_replicas" : %d } }`
+	settings                  = `{ "settings" : { "index.number_of_shards" : 1, "index.number_of_replicas" : %d } }`
 	publicKeyDocID            = "_public_key"
 )
 

plugins/auth/dao.go

@@ -50,12 +50,8 @@ func (es *elasticsearch) createIndex(indexName, mapping string) (bool, error) {
 		return true, nil
 	}
 
-	// set the number_of_replicas to (nodes-1)
-	nodes, err := util.GetTotalNodes()
-	if err != nil {
-		return false, err
-	}
-	settings := fmt.Sprintf(mapping, nodes, nodes-1)
+	replicas := util.GetReplicas()
+	settings := fmt.Sprintf(mapping, replicas)
 	// Meta index does not exists, create a new one
 	_, err = util.GetClient7().CreateIndex(indexName).
 		Body(settings).

plugins/logs/dao.go

@@ -41,12 +41,8 @@ func initPlugin(alias, config string) (*elasticsearch, error) {
 		return es, nil
 	}
 
-	// set number_of_replicas to (nodes-1)
-	nodes, err := util.GetTotalNodes()
-	if err != nil {
-		return nil, err
-	}
-	settings := fmt.Sprintf(config, alias, nodes, nodes-1)
+	replicas := util.GetReplicas()
+	settings := fmt.Sprintf(config, alias, replicas)
 	// Meta index doesn't exist, create one
 	indexName := alias + `-000001`
 	// this works for ES6 client as well

plugins/logs/logs.go

@@ -22,8 +22,8 @@ const (
 	    }
 	  },
 	  "settings": {
-	    "number_of_shards": %d,
-	    "number_of_replicas": %d
+	    "index.number_of_shards": 1,
+	    "index.number_of_replicas": %d
 	  }
 	}`
 	rolloverConfig = `{

plugins/permissions/dao.go

@@ -32,12 +32,8 @@ func initPlugin(indexName, mapping string) (*elasticsearch, error) {
 		return es, nil
 	}
 
-	// set number_of_replicas to (nodes-1)
-	nodes, err := util.GetTotalNodes()
-	if err != nil {
-		return nil, err
-	}
-	settings := fmt.Sprintf(mapping, nodes, nodes-1)
+	replicas := util.GetReplicas()
+	settings := fmt.Sprintf(mapping, replicas)
 
 	// Create a new meta index
 	_, err = util.GetClient7().CreateIndex(indexName).

plugins/permissions/permissions.go

@@ -16,7 +16,7 @@ const (
 	typeName                  = "_doc"
 	envEsURL                  = "ES_CLUSTER_URL"
 	envPermissionEsIndex      = "PERMISSIONS_ES_INDEX"
-	settings                  = `{ "settings" : { "number_of_shards" : %d, "number_of_replicas" : %d } }`
+	settings                  = `{ "settings" : { "index.number_of_shards" : 1, "index.number_of_replicas" : %d } }`
 )
 
 var (

plugins/reindexer/dao.go

@@ -235,8 +235,8 @@ func settingsOf(ctx context.Context, indexName string) (map[string]interface{},
 	settings := make(map[string]interface{})
 
 	settings["index"] = make(map[string]interface{})
-	settings["number_of_shards"] = indexSettings["number_of_shards"]
-	settings["number_of_replicas"] = indexSettings["number_of_replicas"]
+	settings["index.number_of_shards"] = 1
+	settings["index.number_of_replicas"] = util.GetReplicas()
 	analysis, found := indexSettings["analysis"]
 	if found {
 		settings["analysis"] = analysis

plugins/reindexer/mocks.go

@@ -29,7 +29,7 @@ func (m *mockES) mappingsOf(ctx context.Context, indexName string) (map[string]i
 }
 
 func (m *mockES) settingsOf(ctx context.Context, indexName string) (map[string]interface{}, error) {
-	data := []byte(`{"test":{"settings":{"index":{"creation_date":"1552665579942","number_of_shards":"5","number_of_replicas":"1","uuid":"hqhO4oiCReawwtOqFHaVLA","version":{"created":"6020499"},"provided_name":"test"}}}}`)
+	data := []byte(`{"test":{"settings":{"index":{"creation_date":"1552665579942","index.number_of_shards":"5","index.number_of_replicas":"1","uuid":"hqhO4oiCReawwtOqFHaVLA","version":{"created":"6020499"},"provided_name":"test"}}}}`)
 	var dec map[string]*elastic.IndicesGetSettingsResponse
 	_ = json.Unmarshal(data, &dec)
 
@@ -39,8 +39,8 @@ func (m *mockES) settingsOf(ctx context.Context, indexName string) (map[string]i
 	settings := make(map[string]interface{})
 
 	settings["index"] = make(map[string]interface{})
-	settings["number_of_shards"] = indexSettings["number_of_shards"]
-	settings["number_of_replicas"] = indexSettings["number_of_replicas"]
+	settings["index.number_of_shards"] = indexSettings["index.number_of_shards"]
+	settings["index.number_of_replicas"] = indexSettings["index.number_of_replicas"]
 	analysis, found := result.Settings["analysis"]
 	if found {
 		settings["analysis"] = analysis

plugins/users/dao.go

@@ -47,12 +47,8 @@ func initPlugin(indexName, mapping string) (*elasticsearch, error) {
 		return es, nil
 	}
 
-	// set the number_of_replicas to (nodes-1)
-	nodes, err := util.GetTotalNodes()
-	if err != nil {
-		return nil, err
-	}
-	settings := fmt.Sprintf(mapping, nodes, nodes-1)
+	replicas := util.GetReplicas()
+	settings := fmt.Sprintf(mapping, replicas)
 	// Meta index does not exists, create a new one
 	_, err = util.GetClient7().CreateIndex(indexName).
 		Body(settings).

plugins/users/users.go

@@ -14,7 +14,7 @@ const (
 	typeName            = "_doc"
 	envEsURL            = "ES_CLUSTER_URL"
 	defaultUsersEsIndex = ".users"
-	settings            = `{ "settings" : { "number_of_shards" : %d, "number_of_replicas" : %d } }`
+	settings            = `{ "settings" : { "index.number_of_shards" : 1, "index.number_of_replicas" : %d } }`
 )
 
 var (