Merge pull request #272 from cloudability/add-gov-support

add upload support for us-gov-west-1

Author: bbylovas

README.md

@@ -56,7 +56,7 @@ Cloudability Metrics Agent currently does not support Rancher or On Prem cluster
 | CLOUDABILITY_INFORMER_RESYNC_INTERVAL          |                      Optional: Period of time (in hours) that the informers will fully resync the list of running resources. Default: 24 hours. Can be set to 0 to never resync                      |
 | CLOUDABILITY_PARSE_METRIC_DATA                 |                                        Optional: When true, core files will be parsed and non-relevant data will be removed prior to upload. Default: `false`                                        |
 | CLOUDABILITY_HTTPS_CLIENT_TIMEOUT              |                   Optional: Amount (in seconds) of time the http client has before timing out requests. Might need to be increased to clusters with large payloads. Default: `60`                    |
-| CLOUDABILITY_UPLOAD_REGION                     |                   Optional: The region the metrics-agent will upload data to. Default `us-west-2`. Supported values: `us-west-2`, `eu-central-1`, `ap-southeast-2`, `me-central-1`                   |
+| CLOUDABILITY_UPLOAD_REGION                     |          Optional: The region the metrics-agent will upload data to. Default `us-west-2`. Supported values: `us-west-2`, `eu-central-1`, `ap-southeast-2`, `me-central-1`, `us-gov-west-1`           |
 | CLOUDABILITY_CUSTOM_S3_BUCKET                  |  Optional: A custom S3 bucket the metrics-agent will upload data to. If set, the metrics-agent will ONLY upload to this custom location. CLOUDABILITY_CUSTOM_S3_REGION is REQUIRED if this is set.   |
 | CLOUDABILITY_CUSTOM_S3_REGION                  |            Optional: The AWS region that the custom s3 bucket is in. This will initialize the correct region for the s3 client. CLOUDABILITY_CUSTOM_S3_BUCKET is REQUIRED if this is set.            |
 

charts/metrics-agent/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.11.31
+version: 2.11.32
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.11.31
+appVersion: 2.11.32

charts/metrics-agent/values.yaml

@@ -24,7 +24,7 @@ pollInterval: 180
 
 image:
   name: cloudability/metrics-agent
-  tag: 2.11.31
+  tag: 2.11.32
   pullPolicy: Always
 
 imagePullSecrets: []

client/client.go

@@ -34,6 +34,7 @@ const DefaultBaseURL string = "https://metrics-collector.cloudability.com/metric
 const EUBaseURL string = "https://metrics-collector-eu.cloudability.com/metricsample"
 const AUBaseURL string = "https://metrics-collector-au.cloudability.com/metricsample"
 const MEBaseURL string = "https://metrics-collector-me.cloudability.com/metricsample"
+const GovBaseURL string = "https://metrics-collector-gov.cloudability.com/metricsample"
 const defaultTimeout = 1 * time.Minute
 const defaultMaxRetries = 5
 
@@ -423,6 +424,8 @@ func GetUploadURLByRegion(region string) string {
 		return MEBaseURL
 	case "us-west-2":
 		return DefaultBaseURL
+	case "us-gov-west-1":
+		return GovBaseURL
 	default:
 		log.Warnf("Region %s is not supported. Defaulting to us-west-2 region.", region)
 		return DefaultBaseURL

client/client_test.go

@@ -553,6 +553,10 @@ func Test_getUploadURLByRegion(t *testing.T) {
 	if uploadURL != client.MEBaseURL {
 		t.Error("ME URL was not generated correctly")
 	}
+	uploadURL = client.GetUploadURLByRegion("us-gov-west-1")
+	if uploadURL != client.GovBaseURL {
+		t.Error("Gov URL was not generated correctly")
+	}
 	// unsupported region should default to us-west-2 url generation
 	uploadURL = client.GetUploadURLByRegion("my-unsupported-region-1")
 	if uploadURL != client.DefaultBaseURL {

version/version.go

@@ -1,4 +1,4 @@
 package version
 
 // VERSION is the current version of the agent
-var VERSION = "2.11.31"
+var VERSION = "2.11.32"