T-4795 Rename ingestion host to ingesting host (#31)

Author: PetrHeinz

Makefile

@@ -8,7 +8,7 @@ GOLANGCI_LINT := golangci-lint run --disable-all \
 	-E staticcheck \
 	-E typecheck \
 	-E unused
-VERSION := 0.3.6
+VERSION := 0.3.7
 .PHONY: test build
 
 help:

docs/data-sources/source.md

@@ -24,8 +24,8 @@ This Data Source allows you to look up existing Sources using their table name.
 - **created_at** (String) The time when this monitor group was created.
 - **data_region** (String) Region where we store your data.
 - **id** (String) The ID of this source.
+- **ingesting_host** (String) The host where the logs or metrics should be sent. See [documentation](https://betterstack.com/docs/logs/start/) for your specific source platform for details.
 - **ingesting_paused** (Boolean) This property allows you to temporarily pause data ingesting for this source (e.g., when you are reaching your plan's usage quota and you want to prioritize some sources over others).
-- **ingestion_host** (String) The host where the logs or metrics should be sent. See [documentation](https://betterstack.com/docs/logs/start/) for your specific source platform for details.
 - **live_tail_pattern** (String) Freeform text template for formatting Live tail output with columns wrapped in {column} brackets. Example: "PID: {message_json.pid} {level} {message}"
 - **logs_retention** (Number) Data retention for logs in days. There might be additional charges for longer retention.
 - **metrics_retention** (Number) Data retention for metrics in days. There might be additional charges for longer retention.

docs/resources/source.md

@@ -85,7 +85,7 @@ This resource allows you to create, modify, and delete your Sources. For more in
 
 - **created_at** (String) The time when this monitor group was created.
 - **id** (String) The ID of this source.
-- **ingestion_host** (String) The host where the logs or metrics should be sent. See [documentation](https://betterstack.com/docs/logs/start/) for your specific source platform for details.
+- **ingesting_host** (String) The host where the logs or metrics should be sent. See [documentation](https://betterstack.com/docs/logs/start/) for your specific source platform for details.
 - **table_name** (String) The table name generated for this source.
 - **token** (String) The token of this source. This token is used to identify and route the data you will send to Better Stack.
 - **updated_at** (String) The time when this monitor group was updated.

examples/advanced/main.tf

@@ -14,15 +14,15 @@ resource "logtail_source" "this" {
 resource "logtail_metric" "duration_ms" {
   source_id      = logtail_source.this.id
   name           = "duration_ms"
-  sql_expression = "JSONExtract(json, 'duration_ms', 'Nullable(Float)')"
+  sql_expression = "getJSON(raw, 'duration_ms')"
   aggregations   = ["avg", "max", "min"]
   type           = "float64_delta"
 }
 
 resource "logtail_metric" "service_name" {
   source_id      = logtail_source.this.id
   name           = "service_name"
-  sql_expression = "JSONExtract(json, 'service_name', 'Nullable(String)')"
+  sql_expression = "getJSON(raw, 'service_name')"
   aggregations   = []
   type           = "string_low_cardinality"
 }

examples/advanced/outputs.tf

@@ -1,8 +1,8 @@
 output "logtail_source_token" {
   value = logtail_source.this.token
 }
-output "logtail_ingestion_host" {
-  value = logtail_source.this.ingestion_host
+output "logtail_ingesting_host" {
+  value = logtail_source.this.ingesting_host
 }
 
 output "default_metric_expression" {

examples/advanced/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     logtail = {
       source  = "BetterStackHQ/logtail"
-      version = ">= 0.3.6"
+      version = ">= 0.3.7"
     }
   }
 }

examples/basic/outputs.tf

@@ -1,6 +1,6 @@
 output "logtail_source_token" {
   value = logtail_source.this.token
 }
-output "logtail_ingestion_host" {
-  value = logtail_source.this.ingestion_host
+output "logtail_ingesting_host" {
+  value = logtail_source.this.ingesting_host
 }

examples/basic/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     logtail = {
       source  = "BetterStackHQ/logtail"
-      version = ">= 0.3.6"
+      version = ">= 0.3.7"
     }
   }
 }

internal/provider/resource_source.go

@@ -117,7 +117,7 @@ var sourceSchema = map[string]*schema.Schema{
 			}
 		},
 	},
-	"ingestion_host": {
+	"ingesting_host": {
 		Description: "The host where the logs or metrics should be sent. See [documentation](https://betterstack.com/docs/logs/start/) for your specific source platform for details.",
 		Type:        schema.TypeString,
 		Optional:    false,
@@ -224,7 +224,7 @@ type source struct {
 	Token                          *string                   `json:"token,omitempty"`
 	TableName                      *string                   `json:"table_name,omitempty"`
 	Platform                       *string                   `json:"platform,omitempty"`
-	IngestionHost                  *string                   `json:"ingestion_host,omitempty"`
+	IngestingHost                  *string                   `json:"ingesting_host,omitempty"`
 	IngestingPaused                *bool                     `json:"ingesting_paused,omitempty"`
 	LogsRetention                  *int                      `json:"logs_retention,omitempty"`
 	MetricsRetention               *int                      `json:"metrics_retention,omitempty"`
@@ -259,7 +259,7 @@ func sourceRef(in *source) []struct {
 		{k: "token", v: &in.Token},
 		{k: "table_name", v: &in.TableName},
 		{k: "platform", v: &in.Platform},
-		{k: "ingestion_host", v: &in.IngestionHost},
+		{k: "ingesting_host", v: &in.IngestingHost},
 		{k: "ingesting_paused", v: &in.IngestingPaused},
 		{k: "logs_retention", v: &in.LogsRetention},
 		{k: "metrics_retention", v: &in.MetricsRetention},

internal/provider/resource_source_test.go

@@ -34,7 +34,7 @@ func TestResourceSource(t *testing.T) {
 				t.Fatal(err)
 			}
 			body = inject(t, body, "token", "generated_by_logtail")
-			body = inject(t, body, "ingestion_host", "in.logs.betterstack.com")
+			body = inject(t, body, "ingesting_host", "in.logs.betterstack.com")
 			body = inject(t, body, "table_name", "test_source")
 			data.Store(body)
 			w.WriteHeader(http.StatusCreated)
@@ -58,7 +58,7 @@ func TestResourceSource(t *testing.T) {
 				t.Fatal(err)
 			}
 			patched = inject(t, patched, "token", "generated_by_logtail")
-			patched = inject(t, patched, "ingestion_host", "in.logs.betterstack.com")
+			patched = inject(t, patched, "ingesting_host", "in.logs.betterstack.com")
 			patched = inject(t, patched, "table_name", "test_source")
 			data.Store(patched)
 			_, _ = w.Write([]byte(fmt.Sprintf(`{"data":{"id":%q,"attributes":%s}}`, id, patched)))
@@ -100,7 +100,7 @@ func TestResourceSource(t *testing.T) {
 					resource.TestCheckResourceAttr("logtail_source.this", "name", name),
 					resource.TestCheckResourceAttr("logtail_source.this", "platform", platform),
 					resource.TestCheckResourceAttr("logtail_source.this", "token", "generated_by_logtail"),
-					resource.TestCheckResourceAttr("logtail_source.this", "ingestion_host", "in.logs.betterstack.com"),
+					resource.TestCheckResourceAttr("logtail_source.this", "ingesting_host", "in.logs.betterstack.com"),
 					resource.TestCheckResourceAttr("logtail_source.this", "data_region", "eu-hel-1-legacy"),
 				),
 			},
@@ -126,7 +126,7 @@ func TestResourceSource(t *testing.T) {
 					resource.TestCheckResourceAttr("logtail_source.this", "platform", platform),
 					resource.TestCheckResourceAttr("logtail_source.this", "ingesting_paused", "true"),
 					resource.TestCheckResourceAttr("logtail_source.this", "token", "generated_by_logtail"),
-					resource.TestCheckResourceAttr("logtail_source.this", "ingestion_host", "in.logs.betterstack.com"),
+					resource.TestCheckResourceAttr("logtail_source.this", "ingesting_host", "in.logs.betterstack.com"),
 					resource.TestCheckResourceAttr("logtail_source.this", "data_region", "eu-hel-1-legacy"),
 				),
 			},