Merge pull request #38 from sematext/develop

Develop
sematext · Jan 29, 2021 · d15e0cc · d15e0cc
2 parents 428e682 + 3a307e0
commit d15e0cc
Show file tree

Hide file tree

Showing 45 changed files with 231 additions and 145 deletions.
diff --git a/docs/guides/plans.md b/docs/guides/plans.md
@@ -38,10 +38,6 @@ The following table containes valid plan id values to be used in resource defini
 |    131 | &nbsp;&nbsp;sematext_monitor_clickhouse    |   Standard SPM ClickHouse    |
 |    132 | &nbsp;&nbsp;sematext_monitor_clickhouse    |      Pro SPM ClickHouse      |
 |    133 | &nbsp;&nbsp;sematext_monitor_clickhouse    |  Pro Silver SPM ClickHouse   |
-|    117 | &nbsp;&nbsp;sematext_monitor_docker        |       Basic SPM Docker       |
-|    118 | &nbsp;&nbsp;sematext_monitor_docker        |     Standard SPM Docker      |
-|    119 | &nbsp;&nbsp;sematext_monitor_docker        |        Pro SPM Docker        |
-|    120 | &nbsp;&nbsp;sematext_monitor_docker        |    Pro Silver SPM Docker     |
 |     12 | &nbsp;&nbsp;sematext_monitor_elasticsearch |   Basic SPM Elasticsearch    |
 |     13 | &nbsp;&nbsp;sematext_monitor_elasticsearch |  Standard SPM Elasticsearch  |
 |     14 | &nbsp;&nbsp;sematext_monitor_elasticsearch |    Pro SPM Elasticsearch     |
@@ -62,6 +58,10 @@ The following table containes valid plan id values to be used in resource defini
 |      5 | &nbsp;&nbsp;sematext_monitor_hbase         |      Standard SPM HBase      |
 |      6 | &nbsp;&nbsp;sematext_monitor_hbase         |        Pro SPM HBase         |
 |     28 | &nbsp;&nbsp;sematext_monitor_hbase         |     Pro Silver SPM HBase     |
+|    129 | &nbsp;&nbsp;sematext_monitor_infra         |         Basic Infra          |
+|    300 | &nbsp;&nbsp;sematext_monitor_infra         |        Standard Infra        |
+|    301 | &nbsp;&nbsp;sematext_monitor_infra         |          Pro Infra           |
+|    302 | &nbsp;&nbsp;sematext_monitor_infra         |       Pro Silver Infra       |
 |     18 | &nbsp;&nbsp;sematext_monitor_jvm           |        Basic SPM JVM         |
 |     19 | &nbsp;&nbsp;sematext_monitor_jvm           |       Standard SPM JVM       |
 |     20 | &nbsp;&nbsp;sematext_monitor_jvm           |         Pro SPM JVM          |

diff --git a/docs/index.md b/docs/index.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.3"
+      version = ">=0.1.9"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_akka.md b/docs/resources/sematext_monitor_akka.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_apache.md b/docs/resources/sematext_monitor_apache.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_awsebs.md b/docs/resources/sematext_monitor_awsebs.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_awsec2.md b/docs/resources/sematext_monitor_awsec2.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_awselb.md b/docs/resources/sematext_monitor_awselb.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_cassandra.md b/docs/resources/sematext_monitor_cassandra.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_clickhouse.md b/docs/resources/sematext_monitor_clickhouse.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_elasticsearch.md b/docs/resources/sematext_monitor_elasticsearch.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_hadoopmrv1.md b/docs/resources/sematext_monitor_hadoopmrv1.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_hadoopyarn.md b/docs/resources/sematext_monitor_hadoopyarn.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_haproxy.md b/docs/resources/sematext_monitor_haproxy.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_hbase.md b/docs/resources/sematext_monitor_hbase.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_docker.md → docs/resources/sematext_monitor_infra.md b/docs/resources/sematext_monitor_docker.md → docs/resources/sematext_monitor_infra.md
@@ -1,6 +1,6 @@
 # <img src="https://sematext.com/wp-content/uploads/2020/09/just-octi-blue.png" valign="bottom" width="60px"/>**&nbsp;&nbsp;Terraform Provider For Sematext Cloud**
 
-# Sematext Docker Resource
+# Sematext Infra Resource
 
 Creates a monitoring application within [Sematext Cloud](https://sematext.com/cloud/).
 Refer to [Refer to Sematext Provider for authentication detail](../index.md)
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }
@@ -21,7 +21,7 @@ provider "sematext" {
   sematext_region = "US"
 }
 
-resource "sematext_monitor_docker" "mymonitor" {
+resource "sematext_monitor_infra" "mymonitor" {
   name = "my monitor name"
   billing_plan_id = <[plan id](../guides/plans.md)>
 }

diff --git a/docs/resources/sematext_monitor_jvm.md b/docs/resources/sematext_monitor_jvm.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_kafka.md b/docs/resources/sematext_monitor_kafka.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_logsene.md b/docs/resources/sematext_monitor_logsene.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_mobilelogs.md b/docs/resources/sematext_monitor_mobilelogs.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_mongodb.md b/docs/resources/sematext_monitor_mongodb.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_mysql.md b/docs/resources/sematext_monitor_mysql.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_nginx.md b/docs/resources/sematext_monitor_nginx.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_nginxplus.md b/docs/resources/sematext_monitor_nginxplus.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_nodejs.md b/docs/resources/sematext_monitor_nodejs.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_postgresql.md b/docs/resources/sematext_monitor_postgresql.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_rabbitmq.md b/docs/resources/sematext_monitor_rabbitmq.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_redis.md b/docs/resources/sematext_monitor_redis.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_solr.md b/docs/resources/sematext_monitor_solr.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_solrcloud.md b/docs/resources/sematext_monitor_solrcloud.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_spark.md b/docs/resources/sematext_monitor_spark.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_storm.md b/docs/resources/sematext_monitor_storm.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_tomcat.md b/docs/resources/sematext_monitor_tomcat.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/docs/resources/sematext_monitor_zookeeper.md b/docs/resources/sematext_monitor_zookeeper.md
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/generate/generate-docs.sh b/generate/generate-docs.sh
@@ -11,12 +11,12 @@ apptypes=(
     "AWS ELB"
     "Cassandra"
     "ClickHouse"
-    "Docker"
     "Elastic Search"
     "Hadoop-MRv1"
     "Hadoop-YARN"
     "HAProxy"
     "HBase"
+    "Infra"
     "JVM"
     "Kafka"
     "Logsene"
@@ -37,7 +37,7 @@ apptypes=(
     "mobile-logs"
 )
 
-# removed "Kafka-0.7.2" "Memcached" "SearchAnalytics" "Sensei" "Infra"
+# removed "Kafka-0.7.2" "Memcached" "SearchAnalytics" "Sensei" 
 
 
 awsparas='\* `aws_access_key` - (optional) if not set then reads from env AWS_ACCESS_KEY_ID.\n\* `aws_secret_key` - (optionl) is not present set from env AWS_SECRET_ACCESS_KEY\n\* `aws_fetch_frequency` - (required) one of MINUTE|FIVE_MINUTES|FIFTEEN_MINUTES.\n\* `aws_region` - (optional) if not present withh set from env AWS_REGION.'

diff --git a/generate/generate.sh b/generate/generate.sh
@@ -13,12 +13,12 @@ apptypes=(
     "AWS ELB"
     "Cassandra"
     "ClickHouse"
-    "Docker"
     "Elastic Search"
     "Hadoop-MRv1"
     "Hadoop-YARN"
     "HAProxy"
     "HBase"
+    "Infra"
     "JVM"
     "Kafka"
     "Logsene"

diff --git a/generate/resource_sematext_resource.md.template b/generate/resource_sematext_resource.md.template
@@ -12,7 +12,7 @@ terraform {
   required_providers {
     sematext = {
       source = "sematext/sematext"
-      version = ">=0.1.9"
+      version = ">=0.1.10"
     }
   }
 }

diff --git a/go.mod b/go.mod
@@ -3,12 +3,13 @@ module github.com/sematext/terraform-provider-sematext
 go 1.14
 
 require (
-	cloud.google.com/go v0.66.0 // indirect
+	cloud.google.com/go v0.75.0 // indirect
 	github.com/blang/semver/v4 v4.0.0
 	github.com/davecgh/go-spew v1.1.1
-	github.com/google/uuid v1.1.2
-	github.com/hashicorp/go-hclog v0.14.1 //indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3
-	github.com/sematext/sematext-api-client-go v1.1.5
+	github.com/google/uuid v1.2.0
+	github.com/hashicorp/go-hclog v0.15.0 //indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.2
+	github.com/hashicorp/terraform-plugin-test/v2 v2.1.2 // indirect
+	github.com/sematext/sematext-api-client-go v1.2.1
 
 )