Added the ability to select the region for storing server data. Increased agent version.

Author: kochetovd

Dockerfile

@@ -19,6 +19,7 @@ ARG RELEEM_HOSTNAME
 ARG RELEEM_INTERVAL_COLLECT_ALL_METRICS
 ARG RELEEM_QUERY_OPTIMIZATION
 ARG RELEEM_DATABASES_QUERY_OPTIMIZATION
+ARG RELEEM_REGION
 
 RUN apt update \
  && apt install -y \

config/config.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-ReleemAgentVersion = "1.21.3"
+ReleemAgentVersion = "1.21.3.1"
 )
 
 type Config struct {
@@ -38,6 +38,7 @@ type Config struct {
 AwsRDSParameterGroup string `hcl:"aws_rds_parameter_group"`
 QueryOptimization bool `hcl:"query_optimization"`
 DatabasesQueryOptimization string `hcl:"databases_query_optimization"`
+ReleemRegion string `hcl:"releem_region"`
 }
 
 func LoadConfig(filename string, logger logging.Logger) (*Config, error) {

current_version_agent

@@ -1 +1 @@
-1.21.3
+1.21.3.1

docker/releem.conf.tpl

@@ -82,4 +82,9 @@ query_optimization=${RELEEM_QUERY_OPTIMIZATION:-false}
 
 # databases_query_optimization string `hcl:"databases_query_optimization"`
 # List of databases for query optimization
-databases_query_optimization="${RELEEM_DATABASES_QUERY_OPTIMIZATION}"
+databases_query_optimization="${RELEEM_DATABASES_QUERY_OPTIMIZATION}"
+
+# releem_region string `hcl:"releem_region"`
+# Server data storage region - EU or empty.
+releem_region="${RELEEM_REGION}"
+

errors/releemErrors.go

@@ -20,20 +20,25 @@ func (repeater ReleemErrorsRepeater) ProcessErrors(message string) interface{} {
 bodyReader := strings.NewReader(message)
 
 repeater.logger.V(5).Info("Result Send data: ", message)
-var api_domain string
+var api_domain, domain string
 if repeater.configuration != nil {
 env = repeater.configuration.Env
 } else {
 env = "prod"
 }
+if repeater.configuration.ReleemRegion == "EU" {
+domain = "eu.releem.com"
+} else {
+domain = "releem.com"
+}
 if env == "dev2" {
-api_domain = "https://api.dev2.releem.com/v2/events/agent_errors_log"
+api_domain = "https://api.dev2." + domain + "/v2/events/agent_errors_log"
 } else if env == "dev" {
-api_domain = "https://api.dev.releem.com/v2/events/agent_errors_log"
+api_domain = "https://api.dev." + domain + "/v2/events/agent_errors_log"
 } else if env == "stage" {
-api_domain = "https://api.stage.releem.com/v2/events/agent_errors_log"
+api_domain = "https://api.stage." + domain + "/v2/events/agent_errors_log"
 } else {
-api_domain = "https://api.releem.com/v2/events/agent_errors_log"
+api_domain = "https://api." + domain + "/v2/events/agent_errors_log"
 }
 req, err := http.NewRequest(http.MethodPost, api_domain, bodyReader)
 if err != nil {

install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# install.sh - Version 1.21.3
+# install.sh - Version 1.21.3.1
 # (C) Releem, Inc 2022
 # All rights reserved
 
@@ -9,7 +9,7 @@ export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
 # using the package manager.
 
 set -e -E
-install_script_version=1.21.3
+install_script_version=1.21.3.1
 logfile="/var/log/releem-install.log"
 
 WORKDIR="/opt/releem"
@@ -19,7 +19,6 @@ RELEEM_COMMAND="/bin/bash $WORKDIR/mysqlconfigurer.sh"
 
 # Read configuration
 
-
 # Set up a named pipe for logging
 npipe=/tmp/$$.install.tmp
 mknod $npipe p
@@ -30,7 +29,12 @@ exec 1>&-
 exec 1>$npipe 2>&1
 
 function on_exit() {
- curl -s -L -d @$logfile -H "x-releem-api-key: $apikey" -H "Content-Type: application/json" -X POST https://api.releem.com/v2/events/saving_log
+ if [[ "${RELEEM_REGION}" == "EU" ]]; then
+ API_DOMAIN="api.eu.releem.com"
+ else
+ API_DOMAIN="api.releem.com"
+ fi 
+ curl -s -L -d @$logfile -H "x-releem-api-key: $apikey" -H "Content-Type: application/json" -X POST https://${API_DOMAIN}/v2/events/saving_log
  rm -f $npipe
 }
 
@@ -540,6 +544,9 @@ fi
 if [ -n "$RELEEM_DATABASES_QUERY_OPTIMIZATION" ]; then
 echo "databases_query_optimization=\"$RELEEM_DATABASES_QUERY_OPTIMIZATION\"" | $sudo_cmd tee -a $CONF >/dev/null
 fi
+if [ -n "$RELEEM_REGION" ]; then
+echo "releem_region=\"$RELEEM_REGION\"" | $sudo_cmd tee -a $CONF >/dev/null
+fi
 
 echo "interval_seconds=60" | $sudo_cmd tee -a $CONF >/dev/null
 echo "interval_read_config_seconds=3600" | $sudo_cmd tee -a $CONF >/dev/null