Remove unusable elasticsearch opts

2026-02-11 18:16:24 +05:00 · 2024-11-27 18:03:16 +02:00
parent 2a32ade4ba
commit f1cdf920df
8 changed files with 0 additions and 110 deletions
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -541,14 +541,10 @@ const CGRATES_CFG_JSON = `


 				// "elsIndex": "",			// ElsIndex
-				// "elsIfPrimaryTerm": 0,		// ElsIfPrimaryTerm
- 				// "elsIfSeqNo": 0,			// ElsIfSeqNo
 				// "elsOpType": "",			// ElsOpType
 				// "elsPipeline": "",			// ElsPipeline
 				// "elsRouting": "",			// ElsRouting
 				// "elsTimeout": "",			// ElsTimeout
-				// "elsVersion": 0,			// ElsVersionLow
-				// "elsVersionType": "",		// ElsVersionType
 				// "elsWaitForActiveShards": "",	// ElsWaitForActiveShards


--- a/config/eescfg.go
+++ b/config/eescfg.go
@@ -164,7 +164,6 @@ func (eeS *EEsCfg) exporterIDs() []string {

 type ElsOpts struct {
 	Index                    *string
-	IfPrimaryTerm            *int
 	DiscoverNodesOnStart     *bool
 	DiscoverNodeInterval     *time.Duration
 	Cloud                    *bool
@@ -180,13 +179,10 @@ type ElsOpts struct {
 	RetryOnStatus            *[]int
 	MaxRetries               *int
 	DisableRetry             *bool
-	IfSeqNo                  *int
 	OpType                   *string
 	Pipeline                 *string
 	Routing                  *string
 	Timeout                  *time.Duration
-	Version                  *int
-	VersionType              *string
 	WaitForActiveShards      *string
 }

@@ -351,12 +347,6 @@ func (elsOpts *ElsOpts) loadFromJSONCfg(jsnCfg *EventExporterOptsJson) (err erro
 	if jsnCfg.ElsIndex != nil {
 		elsOpts.Index = jsnCfg.ElsIndex
 	}
-	if jsnCfg.ElsIfPrimaryTerm != nil {
-		elsOpts.IfPrimaryTerm = jsnCfg.ElsIfPrimaryTerm
-	}
-	if jsnCfg.ElsIfSeqNo != nil {
-		elsOpts.IfSeqNo = jsnCfg.ElsIfSeqNo
-	}
 	if jsnCfg.ElsOpType != nil {
 		elsOpts.OpType = jsnCfg.ElsOpType
 	}
@@ -373,12 +363,6 @@ func (elsOpts *ElsOpts) loadFromJSONCfg(jsnCfg *EventExporterOptsJson) (err erro
 		}
 		elsOpts.Timeout = utils.DurationPointer(elsTimeout)
 	}
-	if jsnCfg.ElsVersion != nil {
-		elsOpts.Version = jsnCfg.ElsVersion
-	}
-	if jsnCfg.ElsVersionType != nil {
-		elsOpts.VersionType = jsnCfg.ElsVersionType
-	}
 	if jsnCfg.ElsWaitForActiveShards != nil {
 		elsOpts.WaitForActiveShards = jsnCfg.ElsWaitForActiveShards
 	}
@@ -688,14 +672,6 @@ func (elsOpts *ElsOpts) Clone() *ElsOpts {
 		cln.Index = new(string)
 		*cln.Index = *elsOpts.Index
 	}
-	if elsOpts.IfPrimaryTerm != nil {
-		cln.IfPrimaryTerm = new(int)
-		*cln.IfPrimaryTerm = *elsOpts.IfPrimaryTerm
-	}
-	if elsOpts.IfSeqNo != nil {
-		cln.IfSeqNo = new(int)
-		*cln.IfSeqNo = *elsOpts.IfSeqNo
-	}
 	if elsOpts.OpType != nil {
 		cln.OpType = new(string)
 		*cln.OpType = *elsOpts.OpType
@@ -712,14 +688,6 @@ func (elsOpts *ElsOpts) Clone() *ElsOpts {
 		cln.Timeout = new(time.Duration)
 		*cln.Timeout = *elsOpts.Timeout
 	}
-	if elsOpts.Version != nil {
-		cln.Version = new(int)
-		*cln.Version = *elsOpts.Version
-	}
-	if elsOpts.VersionType != nil {
-		cln.VersionType = new(string)
-		*cln.VersionType = *elsOpts.VersionType
-	}
 	if elsOpts.WaitForActiveShards != nil {
 		cln.WaitForActiveShards = new(string)
 		*cln.WaitForActiveShards = *elsOpts.WaitForActiveShards
@@ -1013,12 +981,6 @@ func (eeC *EventExporterCfg) AsMapInterface(separator string) (initialMP map[str
 		if elsOpts.Index != nil {
 			opts[utils.ElsIndex] = *elsOpts.Index
 		}
-		if elsOpts.IfPrimaryTerm != nil {
-			opts[utils.ElsIfPrimaryTerm] = *elsOpts.IfPrimaryTerm
-		}
-		if elsOpts.IfSeqNo != nil {
-			opts[utils.ElsIfSeqNo] = *elsOpts.IfSeqNo
-		}
 		if elsOpts.OpType != nil {
 			opts[utils.ElsOpType] = *elsOpts.OpType
 		}
@@ -1031,12 +993,6 @@ func (eeC *EventExporterCfg) AsMapInterface(separator string) (initialMP map[str
 		if elsOpts.Timeout != nil {
 			opts[utils.ElsTimeout] = elsOpts.Timeout.String()
 		}
-		if elsOpts.Version != nil {
-			opts[utils.ElsVersionLow] = *elsOpts.Version
-		}
-		if elsOpts.VersionType != nil {
-			opts[utils.ElsVersionType] = *elsOpts.VersionType
-		}
 		if elsOpts.WaitForActiveShards != nil {
 			opts[utils.ElsWaitForActiveShards] = *elsOpts.WaitForActiveShards
 		}
--- a/config/eescfg_test.go
+++ b/config/eescfg_test.go
@@ -46,14 +46,10 @@ func TestEESClone(t *testing.T) {
 					"allowNativePasswords": "true",
 				},
 			"elsIndex":"test",
-			"elsIfPrimaryTerm":0,
-			"elsIfSeqNo":0,
 			"elsOpType":"test2",
 			"elsPipeline":"test3",
 			"elsRouting":"test4",
 			"elsTimeout":"1m",
-			"elsVersion":2,
-			"elsVersionType":"test5",
 			"elsWaitForActiveShards":"test6",
 			"sqlMaxIdleConns":4,
 			"sqlMaxOpenConns":6,
@@ -244,14 +240,10 @@ func TestEESClone(t *testing.T) {
 					},
 					Els: &ElsOpts{
 						Index:               utils.StringPointer("test"),
-						IfPrimaryTerm:       utils.IntPointer(0),
-						IfSeqNo:             utils.IntPointer(0),
 						OpType:              utils.StringPointer("test2"),
 						Pipeline:            utils.StringPointer("test3"),
 						Routing:             utils.StringPointer("test4"),
 						Timeout:             utils.DurationPointer(1 * time.Minute),
-						Version:             utils.IntPointer(2),
-						VersionType:         utils.StringPointer("test5"),
 						WaitForActiveShards: utils.StringPointer("test6"),
 					},
 					Kafka: &KafkaOpts{
@@ -376,14 +368,10 @@ func TestEventExporterOptsloadFromJsonCfg(t *testing.T) {
 	eventExporterOptsJSON := &EventExporterOptsJson{

 		ElsIndex:                 utils.StringPointer("test"),
-		ElsIfPrimaryTerm:         utils.IntPointer(0),
-		ElsIfSeqNo:               utils.IntPointer(0),
 		ElsOpType:                utils.StringPointer("test2"),
 		ElsPipeline:              utils.StringPointer("test3"),
 		ElsRouting:               utils.StringPointer("test4"),
 		ElsTimeout:               utils.StringPointer("1m"),
-		ElsVersion:               utils.IntPointer(2),
-		ElsVersionType:           utils.StringPointer("test5"),
 		ElsWaitForActiveShards:   utils.StringPointer("test6"),
 		SQLMaxIdleConns:          utils.IntPointer(4),
 		SQLMaxOpenConns:          utils.IntPointer(6),
@@ -406,14 +394,10 @@ func TestEventExporterOptsloadFromJsonCfg(t *testing.T) {
 	expected := &EventExporterOpts{
 		Els: &ElsOpts{
 			Index:               utils.StringPointer("test"),
-			IfPrimaryTerm:       utils.IntPointer(0),
-			IfSeqNo:             utils.IntPointer(0),
 			OpType:              utils.StringPointer("test2"),
 			Pipeline:            utils.StringPointer("test3"),
 			Routing:             utils.StringPointer("test4"),
 			Timeout:             utils.DurationPointer(1 * time.Minute),
-			Version:             utils.IntPointer(2),
-			VersionType:         utils.StringPointer("test5"),
 			WaitForActiveShards: utils.StringPointer("test6"),
 		},
 		SQL: &SQLOpts{
@@ -898,15 +882,11 @@ func TestEEsCfgAsMapInterface(t *testing.T) {
                  "export_path": "/tmp/testCSV",			
 			      "opts": {
 					"elsIndex":"test",
-					"elsIfPrimaryTerm":0,
 					"kafkaTopic": "test",	
-					"elsIfSeqNo":0,
 					"elsOpType":"test2",
 					"elsPipeline":"test3",
 					"elsRouting":"test4",
 					"elsTimeout":"1m",
-					"elsVersion":2,
-					"elsVersionType":"test5",
 					"elsWaitForActiveShards":"test6",
 					"sqlMaxIdleConns":4,
 					"sqlMaxOpenConns":6,
@@ -985,14 +965,10 @@ func TestEEsCfgAsMapInterface(t *testing.T) {
 				utils.OptsCfg: map[string]any{
 					utils.KafkaTopic:               "test",
 					utils.ElsIndex:                 "test",
-					utils.ElsIfPrimaryTerm:         0,
-					utils.ElsIfSeqNo:               0,
 					utils.ElsOpType:                "test2",
 					utils.ElsPipeline:              "test3",
 					utils.ElsRouting:               "test4",
 					utils.ElsTimeout:               "1m0s",
-					utils.ElsVersionLow:            2,
-					utils.ElsVersionType:           "test5",
 					utils.ElsWaitForActiveShards:   "test6",
 					utils.SQLMaxIdleConnsCfg:       4,
 					utils.SQLMaxOpenConns:          6,
@@ -1144,14 +1120,10 @@ func TestEEsCfgloadFromJSONCfg(t *testing.T) {
 		ElsMaxRetries:               &nm,
 		ElsDisableRetry:             &bl,
 		ElsIndex:                    &str,
-		ElsIfPrimaryTerm:            &nm,
-		ElsIfSeqNo:                  &nm,
 		ElsOpType:                   &str,
 		ElsPipeline:                 &str,
 		ElsRouting:                  &str,
 		ElsTimeout:                  &tms,
-		ElsVersion:                  &nm,
-		ElsVersionType:              &str,
 		ElsWaitForActiveShards:      &str,
 		SQLMaxIdleConns:             &nm,
 		SQLMaxOpenConns:             &nm,
@@ -1195,7 +1167,6 @@ func TestEEsCfgloadFromJSONCfg(t *testing.T) {
 	}
 	exp := &ElsOpts{
 		Index:                    &str,
-		IfPrimaryTerm:            &nm,
 		DiscoverNodesOnStart:     &bl,
 		DiscoverNodeInterval:     &tm,
 		Cloud:                    &bl,
@@ -1211,13 +1182,10 @@ func TestEEsCfgloadFromJSONCfg(t *testing.T) {
 		RetryOnStatus:            &[]int{nm},
 		MaxRetries:               &nm,
 		DisableRetry:             &bl,
-		IfSeqNo:                  &nm,
 		OpType:                   &str,
 		Pipeline:                 &str,
 		Routing:                  &str,
 		Timeout:                  &tm,
-		Version:                  &nm,
-		VersionType:              &str,
 		WaitForActiveShards:      &str,
 	}
 	err := elsOpts.loadFromJSONCfg(jsnCfg)
--- a/config/libconfig_json.go
+++ b/config/libconfig_json.go
@@ -317,14 +317,10 @@ type EventExporterOptsJson struct {
 	ElsMaxRetries               *int              `json:"elsMaxRetries"`
 	ElsDisableRetry             *bool             `json:"elsDisableRetry"`
 	ElsIndex                    *string           `json:"elsIndex"`
-	ElsIfPrimaryTerm            *int              `json:"elsIfPrimaryTerm"`
-	ElsIfSeqNo                  *int              `json:"elsIfSeqNo"`
 	ElsOpType                   *string           `json:"elsOpType"`
 	ElsPipeline                 *string           `json:"elsPipeline"`
 	ElsRouting                  *string           `json:"elsRouting"`
 	ElsTimeout                  *string           `json:"elsTimeout"`
-	ElsVersion                  *int              `json:"elsVersion"`
-	ElsVersionType              *string           `json:"elsVersionType"`
 	ElsWaitForActiveShards      *string           `json:"elsWaitForActiveShards"`
 	SQLMaxIdleConns             *int              `json:"sqlMaxIdleConns"`
 	SQLMaxOpenConns             *int              `json:"sqlMaxOpenConns"`
--- a/data/conf/cgrates/cgrates.json
+++ b/data/conf/cgrates/cgrates.json
@@ -512,14 +512,10 @@


 // 				// "elsIndex": "",			// ElsIndex
-// 				// "elsIfPrimaryTerm": 0,		// ElsIfPrimaryTerm
-//  				// "elsIfSeqNo": 0,			// ElsIfSeqNo
 // 				// "elsOpType": "",			// ElsOpType
 // 				// "elsPipeline": "",			// ElsPipeline
 // 				// "elsRouting": "",			// ElsRouting
 // 				// "elsTimeout": "",			// ElsTimeout
-// 				// "elsVersion": 0,			// ElsVersionLow
-// 				// "elsVersionType": "",		// ElsVersionType
 // 				// "elsWaitForActiveShards": "",	// ElsWaitForActiveShards


--- a/data/conf/samples/ees_elastic/cgrates.json
+++ b/data/conf/samples/ees_elastic/cgrates.json
@@ -82,14 +82,10 @@
 				// "elsRetryOnStatus": [],
 				// "elsMaxRetries": 0,
 				// "elsDisableRetry": false,
-				// "elsIfPrimaryTerm": 0,
- 				// "elsIfSeqNo": 0,
 				// "elsOpType": "",
 				// "elsPipeline": "",
 				// "elsRouting": "",
 				// "elsTimeout": "",
-				// "elsVersion": 0,
-				// "elsVersionType": "",
 				// "elsWaitForActiveShards": ""
 			},
 			"fields": [
--- a/ees/elastic.go
+++ b/ees/elastic.go
@@ -22,14 +22,12 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 	"sync"

 	"github.com/elastic/elastic-transport-go/v8/elastictransport"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types/enums/optype"
 	"github.com/elastic/go-elasticsearch/v8/typedapi/types/enums/refresh"
-	"github.com/elastic/go-elasticsearch/v8/typedapi/types/enums/versiontype"

 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/utils"
@@ -177,12 +175,6 @@ func (e *ElasticEE) ExportEvent(event any, key string) error {
 		Request(event).
 		Refresh(refresh.True)

-	if opts.IfPrimaryTerm != nil {
-		req.IfPrimaryTerm(strconv.Itoa(*opts.IfPrimaryTerm))
-	}
-	if opts.IfSeqNo != nil {
-		req.IfSeqNo(strconv.Itoa(*opts.IfSeqNo))
-	}
 	if opts.OpType != nil {
 		req.OpType(optype.OpType{Name: *opts.OpType})
 	}
@@ -195,12 +187,6 @@ func (e *ElasticEE) ExportEvent(event any, key string) error {
 	if opts.Timeout != nil {
 		req.Timeout((*opts.Timeout).String())
 	}
-	if opts.Version != nil {
-		req.Version(strconv.Itoa(*opts.Version))
-	}
-	if opts.VersionType != nil {
-		req.VersionType(versiontype.VersionType{Name: *opts.VersionType})
-	}
 	if opts.WaitForActiveShards != nil {
 		req.WaitForActiveShards(*opts.WaitForActiveShards)
 	}
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -2856,14 +2856,10 @@ const (

 	// EEs Elasticsearch options
 	ElsIndex               = "elsIndex"
-	ElsIfPrimaryTerm       = "elsIfPrimaryTerm"
-	ElsIfSeqNo             = "elsIfSeqNo"
 	ElsOpType              = "elsOpType"
 	ElsPipeline            = "elsPipeline"
 	ElsRouting             = "elsRouting"
 	ElsTimeout             = "elsTimeout"
-	ElsVersionLow          = "elsVersion"
-	ElsVersionType         = "elsVersionType"
 	ElsWaitForActiveShards = "elsWaitForActiveShards"

 	//EES ElasticSearch Logger Options