multiversx · miiu96 · Jun 6, 2025 · Jun 5, 2025 · Jun 5, 2025 · Jun 5, 2025
diff --git a/cmd/elasticindexer/config/prefs.toml b/cmd/elasticindexer/config/prefs.toml
@@ -18,7 +18,6 @@
         acknowledge-timeout-in-seconds = 50
 
     [config.elastic-cluster]
-        use-kibana = false
         url = "http://localhost:9200"
         username = ""
         password = ""

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.6.0
 	github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476
-	github.com/multiversx/mx-chain-core-go v1.3.2-0.20250520074139-18b645ad397a
+	github.com/multiversx/mx-chain-core-go v1.3.2-0.20250602142114-cb1013453d39
 	github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273
 	github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20250520075408-c94bee9ee163
 	github.com/prometheus/client_model v0.6.1

diff --git a/go.sum b/go.sum
@@ -130,8 +130,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476 h1:Dn73bH1AdG+7+3/FFRfOiivOEvwPyzZUBWWxpk8QVxc=
 github.com/multiversx/mx-chain-communication-go v1.2.1-0.20250520083403-3f2bad6d5476/go.mod h1:99+FW6f7X0Ri5tph+2l2GaDVrdej1do89exkfh7gilE=
-github.com/multiversx/mx-chain-core-go v1.3.2-0.20250520074139-18b645ad397a h1:dhCobNEcBdvutX+0UYF/l86oLVO9iUiUeF3sLFa9qhE=
-github.com/multiversx/mx-chain-core-go v1.3.2-0.20250520074139-18b645ad397a/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
+github.com/multiversx/mx-chain-core-go v1.3.2-0.20250602142114-cb1013453d39 h1:a+98PN1XXTCYiJEdg7gpqfTOxGuQqvA8H1yglidV/p0=
+github.com/multiversx/mx-chain-core-go v1.3.2-0.20250602142114-cb1013453d39/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
 github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d h1:NI5uKpkwP5XZu9gtDiWxmbbb07T9hXegPist17WAzY4=
 github.com/multiversx/mx-chain-crypto-go v1.2.13-0.20250520075055-8ab2a164945d/go.mod h1:yekQt4uB5LYXtimbhpdUbnFexjucWrQG/t+AX55bdM8=
 github.com/multiversx/mx-chain-logger-go v1.0.16-0.20250520074859-b2faf3c90273 h1:1I2CgGDAMINxrKI6yzSP/Y6Wow2YUmqegUXcltpGXQA=

diff --git a/process/elasticproc/elasticProcessor.go b/process/elasticproc/elasticProcessor.go
@@ -96,7 +96,7 @@ func NewElasticProcessor(arguments *ArgElasticProcessor) (*elasticProcessor, err
 		bulkRequestMaxSize: arguments.BulkRequestMaxSize,
 	}
 
-	err = ei.init(arguments.UseKibana, arguments.IndexTemplates, arguments.IndexPolicies, arguments.ExtraMappings)
+	err = ei.init(arguments.IndexTemplates, arguments.IndexPolicies, arguments.ExtraMappings)
 	if err != nil {
 		return nil, err
 	}
@@ -107,21 +107,12 @@ func NewElasticProcessor(arguments *ArgElasticProcessor) (*elasticProcessor, err
 }
 
 // TODO move all the index create part in a new component
-func (ei *elasticProcessor) init(useKibana bool, indexTemplates, _ map[string]*bytes.Buffer, extraMappings []templates.ExtraMapping) error {
+func (ei *elasticProcessor) init(indexTemplates, _ map[string]*bytes.Buffer, extraMappings []templates.ExtraMapping) error {
 	err := ei.createOpenDistroTemplates(indexTemplates)
 	if err != nil {
 		return err
 	}
 
-	//nolint
-	if useKibana {
-		// TODO: Re-activate after we think of a solid way to handle forks+rotating indexes
-		// err = ei.createIndexPolicies(indexPolicies)
-		// if err != nil {
-		//	return err
-		// }
-	}
-
 	err = ei.createIndexTemplates(indexTemplates)
 	if err != nil {
 		return err

diff --git a/process/elasticproc/factory/elasticProcessorFactory.go b/process/elasticproc/factory/elasticProcessorFactory.go
@@ -35,7 +35,7 @@ type ArgElasticProcessorFactory struct {
 
 // CreateElasticProcessor will create a new instance of ElasticProcessor
 func CreateElasticProcessor(arguments ArgElasticProcessorFactory) (dataindexer.ElasticProcessor, error) {
-	templatesAndPoliciesReader := templatesAndPolicies.CreateTemplatesAndPoliciesReader(arguments.UseKibana)
+	templatesAndPoliciesReader := templatesAndPolicies.NewTemplatesAndPolicyReader()
 	indexTemplates, indexPolicies, err := templatesAndPoliciesReader.GetElasticTemplatesAndPolicies()
 	if err != nil {
 		return nil, err

diff --git a/process/elasticproc/templatesAndPolicies/noKibana.go b/process/elasticproc/templatesAndPolicies/noKibana.go
diff --git a/process/elasticproc/templatesAndPolicies/reader.go b/process/elasticproc/templatesAndPolicies/reader.go
@@ -0,0 +1,53 @@
+package templatesAndPolicies
+
+import (
+	"bytes"
+
+	indexer "github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer"
+	"github.com/multiversx/mx-chain-es-indexer-go/templates"
+	"github.com/multiversx/mx-chain-es-indexer-go/templates/indices"
+)
+
+type templatesAndPolicyReader struct{}
+
+// NewTemplatesAndPolicyReader will create a new instance of templatesAndPolicyReader
+func NewTemplatesAndPolicyReader() *templatesAndPolicyReader {
+	return new(templatesAndPolicyReader)
+}
+
+// GetElasticTemplatesAndPolicies will return templates and policies
+func (tr *templatesAndPolicyReader) GetElasticTemplatesAndPolicies() (map[string]*bytes.Buffer, map[string]*bytes.Buffer, error) {
+	indexPolicies := make(map[string]*bytes.Buffer)
+	indexTemplates := make(map[string]*bytes.Buffer)
+
+	indexTemplates["opendistro"] = indices.OpenDistro.ToBuffer()
+	indexTemplates[indexer.TransactionsIndex] = indices.Transactions.ToBuffer()
+	indexTemplates[indexer.BlockIndex] = indices.Blocks.ToBuffer()
+	indexTemplates[indexer.MiniblocksIndex] = indices.Miniblocks.ToBuffer()
+	indexTemplates[indexer.RatingIndex] = indices.Rating.ToBuffer()
+	indexTemplates[indexer.RoundsIndex] = indices.Rounds.ToBuffer()
+	indexTemplates[indexer.ValidatorsIndex] = indices.Validators.ToBuffer()
+	indexTemplates[indexer.AccountsIndex] = indices.Accounts.ToBuffer()
+	indexTemplates[indexer.AccountsHistoryIndex] = indices.AccountsHistory.ToBuffer()
+	indexTemplates[indexer.AccountsESDTIndex] = indices.AccountsESDT.ToBuffer()
+	indexTemplates[indexer.AccountsESDTHistoryIndex] = indices.AccountsESDTHistory.ToBuffer()
+	indexTemplates[indexer.EpochInfoIndex] = indices.EpochInfo.ToBuffer()
+	indexTemplates[indexer.ReceiptsIndex] = indices.Receipts.ToBuffer()
+	indexTemplates[indexer.ScResultsIndex] = indices.SCResults.ToBuffer()
+	indexTemplates[indexer.SCDeploysIndex] = indices.SCDeploys.ToBuffer()
+	indexTemplates[indexer.TokensIndex] = indices.Tokens.ToBuffer()
+	indexTemplates[indexer.TagsIndex] = indices.Tags.ToBuffer()
+	indexTemplates[indexer.LogsIndex] = indices.Logs.ToBuffer()
+	indexTemplates[indexer.DelegatorsIndex] = indices.Delegators.ToBuffer()
+	indexTemplates[indexer.OperationsIndex] = indices.Operations.ToBuffer()
+	indexTemplates[indexer.ESDTsIndex] = indices.ESDTs.ToBuffer()
+	indexTemplates[indexer.ValuesIndex] = indices.Values.ToBuffer()
+	indexTemplates[indexer.EventsIndex] = indices.Events.ToBuffer()
+
+	return indexTemplates, indexPolicies, nil
+}
+
+// GetExtraMappings will return an array of indices extra mappings
+func (tr *templatesAndPolicyReader) GetExtraMappings() ([]templates.ExtraMapping, error) {
+	return []templates.ExtraMapping{}, nil
+}
diff --git a/...roc/templatesAndPolicies/noKibana_test.go → ...cproc/templatesAndPolicies/reader_test.go b/...roc/templatesAndPolicies/noKibana_test.go → ...cproc/templatesAndPolicies/reader_test.go
@@ -9,7 +9,7 @@ import (
 func TestTemplatesAndPolicyReaderNoKibana_GetElasticTemplatesAndPolicies(t *testing.T) {
 	t.Parallel()
 
-	reader := NewTemplatesAndPolicyReaderNoKibana()
+	reader := NewTemplatesAndPolicyReader()
 
 	templates, policies, err := reader.GetElasticTemplatesAndPolicies()
 	require.Nil(t, err)

diff --git a/process/elasticproc/templatesAndPolicies/templatesAndPoliciesFactory.go b/process/elasticproc/templatesAndPolicies/templatesAndPoliciesFactory.go
diff --git a/process/elasticproc/templatesAndPolicies/templatesAndPoliciesFactory_test.go b/process/elasticproc/templatesAndPolicies/templatesAndPoliciesFactory_test.go
diff --git a/process/elasticproc/templatesAndPolicies/withKibana.go b/process/elasticproc/templatesAndPolicies/withKibana.go
diff --git a/process/elasticproc/templatesAndPolicies/withKibana_test.go b/process/elasticproc/templatesAndPolicies/withKibana_test.go
diff --git a/templates/noKibana/accounts.go → templates/indices/accounts.go b/templates/noKibana/accounts.go → templates/indices/accounts.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 import (
 	"github.com/multiversx/mx-chain-es-indexer-go/templates"

diff --git a/templates/noKibana/accountsESDT.go → templates/indices/accountsESDT.go b/templates/noKibana/accountsESDT.go → templates/indices/accountsESDT.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // AccountsESDT will hold the configuration for the accountsesdt index
 var AccountsESDT = Object{

diff --git a/templates/noKibana/accountsESDTHistory.go → templates/indices/accountsESDTHistory.go b/templates/noKibana/accountsESDTHistory.go → templates/indices/accountsESDTHistory.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // AccountsESDTHistory will hold the configuration for the accountsesdthistory index
 var AccountsESDTHistory = Object{

diff --git a/templates/noKibana/accountsHistory.go → templates/indices/accountsHistory.go b/templates/noKibana/accountsHistory.go → templates/indices/accountsHistory.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // AccountsHistory will hold the configuration for the accountshistory index
 var AccountsHistory = Object{

diff --git a/templates/noKibana/blocks.go → templates/indices/blocks.go b/templates/noKibana/blocks.go → templates/indices/blocks.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // Blocks will hold the configuration for the blocks index
 var Blocks = Object{

diff --git a/templates/noKibana/delegators.go → templates/indices/delegators.go b/templates/noKibana/delegators.go → templates/indices/delegators.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // Delegators will hold the configuration for the delegators index
 var Delegators = Object{

diff --git a/templates/noKibana/deploys.go → templates/indices/deploys.go b/templates/noKibana/deploys.go → templates/indices/deploys.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // SCDeploys will hold the configuration for the scdeploys index
 var SCDeploys = Object{

diff --git a/templates/noKibana/epochInfo.go → templates/indices/epochInfo.go b/templates/noKibana/epochInfo.go → templates/indices/epochInfo.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // EpochInfo will hold the configuration for the epochinfo index
 var EpochInfo = Object{

diff --git a/templates/noKibana/esdts.go → templates/indices/esdts.go b/templates/noKibana/esdts.go → templates/indices/esdts.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // ESDTs will hold the configuration for the esdts index
 var ESDTs = Object{

diff --git a/templates/noKibana/events.go → templates/indices/events.go b/templates/noKibana/events.go → templates/indices/events.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // Events will hold the configuration for the events index
 var Events = Object{

diff --git a/templates/noKibana/logs.go → templates/indices/logs.go b/templates/noKibana/logs.go → templates/indices/logs.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // Logs will hold the configuration for the logs index
 var Logs = Object{

diff --git a/templates/noKibana/miniblocks.go → templates/indices/miniblocks.go b/templates/noKibana/miniblocks.go → templates/indices/miniblocks.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // Miniblocks will hold the configuration for the miniblocks index
 var Miniblocks = Object{

diff --git a/templates/noKibana/opendistro.go → templates/indices/opendistro.go b/templates/noKibana/opendistro.go → templates/indices/opendistro.go
@@ -1,4 +1,4 @@
-package noKibana
+package indices
 
 // OpenDistro will hold the configuration for the opendistro
 var OpenDistro = Object{