17th-Ranger-Battalion-ORG/Arma3-Influx
7
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove default bucket

Browse Source
This commit is contained in:
IndigoFox
2023-04-09 19:03:57 -07:00
parent 1eac67d09a
commit ac5869e63b
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
arma.go
View File

@@ -51,10 +51,9 @@ func init() {
// } // }
type influxSettings struct { type influxSettings struct {
Host string `json:"host"` Host string `json:"host"`
Token string `json:"token"` Token string `json:"token"`
Org string `json:"org"` Org string `json:"org"`
DefaultBucket string `json:"defaultBucket"`
} }
type arma3Settings struct { type arma3Settings struct {
@@ -69,13 +68,13 @@ type settingsJson struct {
func connectToInflux() string { func connectToInflux() string {
if influxConnectionSettings.Host == "" { if influxConnectionSettings.Host == "" {
logLine("connectToInflux", `["influxConnectionSettings.Host is empty", "ERROR"]`) logLine("connectToInflux", `["influxConnectionSettings.Host is empty", "ERROR"]`)
return "ERROR" return "Error connecting to Influx"
} }
DB_CLIENT = influxdb2.NewClientWithOptions(influxConnectionSettings.Host, influxConnectionSettings.Token, influxdb2.DefaultOptions().SetBatchSize(500).SetFlushInterval(2000)) DB_CLIENT = influxdb2.NewClientWithOptions(influxConnectionSettings.Host, influxConnectionSettings.Token, influxdb2.DefaultOptions().SetBatchSize(500).SetFlushInterval(2000))
logLine("connectToInflux", `["DB_CLIENT created", "INFO"]`) logLine("connectToInflux", `["DB_CLIENT created", "INFO"]`)
return "CONNECTED" return "Connected to Influx successfully"
} }
func deinitialize() { func deinitialize() {
@@ -83,6 +82,20 @@ func deinitialize() {
DB_CLIENT.Close() DB_CLIENT.Close()
} }
// sanitize line protocol for influx
func sanitizeLineProtocol(line string) string {
// replace all spaces with underscores
// line = strings.ReplaceAll(line, ` `, `\ `)
// replace all commas with underscores
// line = strings.ReplaceAll(line, `,`, `\,`)
// replace all equals with underscores
// line = strings.ReplaceAll(line, "=", "_")
// replace all quotes with underscores
// line = strings.ReplaceAll(line, "\"", "_")
return line
}
func getDir() string { func getDir() string {
dir, err := os.Getwd() dir, err := os.Getwd()
if err != nil { if err != nil {
@@ -113,10 +126,9 @@ func loadSettings() (dir string, result string, host string) {
defer file.Close() defer file.Close()
// write the default settings to the file // write the default settings to the file
ifSet := influxSettings{ ifSet := influxSettings{
Host: "http://localhost:8086", Host: "http://localhost:8086",
Token: "my-token", Token: "my-token",
Org: "my-org", Org: "my-org",
DefaultBucket: "my-bucket",
} }
a3Set := arma3Settings{ a3Set := arma3Settings{
RefreshRateMs: 1000, RefreshRateMs: 1000,
@@ -253,11 +265,7 @@ func sendToInflux(a3DataRaw *[]string) string {
} }
// use custom bucket or default // use custom bucket or default
var customBucket string = trimQuotes(string(a3Data[0])) var bucket string = trimQuotes(string(a3Data[0]))
bucket := influxConnectionSettings.DefaultBucket
if customBucket != "" {
bucket = customBucket
}
WRITE_API := DB_CLIENT.WriteAPI(influxConnectionSettings.Org, bucket) WRITE_API := DB_CLIENT.WriteAPI(influxConnectionSettings.Org, bucket)
@@ -321,11 +329,10 @@ func goRVExtension(output *C.char, outputsize C.size_t, input *C.char) {
if result != "" { if result != "" {
logLine("goRVExtension", result) logLine("goRVExtension", result)
temp = fmt.Sprintf( temp = fmt.Sprintf(
`["%s", "%s", "%s", "%s", "%d"]`, `["%s", "%s", "%s", "%d"]`,
EXTENSION_VERSION, EXTENSION_VERSION,
influxConnectionSettings.Host, influxConnectionSettings.Host,
influxConnectionSettings.Org, influxConnectionSettings.Org,
influxConnectionSettings.DefaultBucket,
a3Settings.RefreshRateMs, a3Settings.RefreshRateMs,
) )
} }