Fix some gaps

SigNoz · Sep 16, 2024 · 86513fc · 86513fc
1 parent 9a30cb3
commit 86513fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cmd/signozschemamigrator/schema_migrator/squashed_logs_migrations.go b/cmd/signozschemamigrator/schema_migrator/squashed_logs_migrations.go
@@ -523,7 +523,7 @@ ORDER BY name ASC`,
 						{Name: "attributes_string", Type: MapColumnType{LowCardinalityColumnType{ColumnTypeString}, ColumnTypeString}, Codec: "ZSTD(1)"},
 						{Name: "attributes_number", Type: MapColumnType{LowCardinalityColumnType{ColumnTypeString}, ColumnTypeFloat64}, Codec: "ZSTD(1)"},
 						{Name: "attributes_bool", Type: MapColumnType{LowCardinalityColumnType{ColumnTypeString}, ColumnTypeBool}, Codec: "ZSTD(1)"},
-						{Name: "resource_string", Type: MapColumnType{LowCardinalityColumnType{ColumnTypeString}, ColumnTypeString}, Codec: "ZSTD(1)"},
+						{Name: "resources_string", Type: MapColumnType{LowCardinalityColumnType{ColumnTypeString}, ColumnTypeString}, Codec: "ZSTD(1)"},
 						{Name: "scope_name", Type: ColumnTypeString, Codec: "ZSTD(1)"},
 						{Name: "scope_version", Type: ColumnTypeString, Codec: "ZSTD(1)"},
 						{Name: "scope_string", Type: MapColumnType{LowCardinalityColumnType{ColumnTypeString}, ColumnTypeString}, Codec: "ZSTD(1)"},

diff --git a/cmd/signozschemamigrator/schema_migrator/squashed_metrics_migrations.go b/cmd/signozschemamigrator/schema_migrator/squashed_metrics_migrations.go
@@ -379,7 +379,7 @@ var (
 					},
 					Engine: Distributed{
 						Database:    "signoz_metrics",
-						Table:       "time_series_v4",
+						Table:       "time_series_v4_6hrs",
 						ShardingKey: "cityHash64(env, temporality, metric_name, fingerprint)",
 					},
 				},

diff --git a/cmd/signozschemamigrator/schema_migrator/squashed_traces_migrations.go b/cmd/signozschemamigrator/schema_migrator/squashed_traces_migrations.go
@@ -77,7 +77,7 @@ var (
 						PartitionBy: "toDate(timestamp)",
 						PrimaryKey:  "(serviceName, hasError, toStartOfHour(timestamp), name)",
 						OrderBy:     "(serviceName, hasError, toStartOfHour(timestamp), name, timestamp)",
-						TTL:         "toDateTime(timestamp) + toIntervalSecond(604800)",
+						TTL:         "toDateTime(timestamp) + toIntervalSecond(1296000)",
 						Settings: TableSettings{
 							{Name: "index_granularity", Value: "8192"},
 							{Name: "ttl_only_drop_parts", Value: "1"},
@@ -199,7 +199,7 @@ var (
 					Engine: MergeTree{
 						PartitionBy: "toDate(timestamp)",
 						OrderBy:     "(durationNano, timestamp)",
-						TTL:         "toDateTime(timestamp) + toIntervalSecond(604800)",
+						TTL:         "toDateTime(timestamp) + toIntervalSecond(1296000)",
 						Settings: TableSettings{
 							{
 								Name:  "index_granularity",
@@ -367,7 +367,7 @@ ORDER BY
 					Engine: MergeTree{
 						PartitionBy: "toDate(timestamp)",
 						OrderBy:     "(timestamp, groupID)",
-						TTL:         "toDateTime(timestamp) + toIntervalSecond(604800)",
+						TTL:         "toDateTime(timestamp) + toIntervalSecond(1296000)",
 						Settings: TableSettings{
 							{Name: "index_granularity", Value: "8192"},
 							{Name: "ttl_only_drop_parts", Value: "1"},
@@ -429,7 +429,7 @@ ORDER BY
 					Engine: MergeTree{
 						PartitionBy: "toDate(timestamp)",
 						OrderBy:     "(traceID)",
-						TTL:         "toDateTime(timestamp) + toIntervalSecond(604800)",
+						TTL:         "toDateTime(timestamp) + toIntervalSecond(1296000)",
 						Settings: TableSettings{
 							{Name: "index_granularity", Value: "1024"},
 							{Name: "ttl_only_drop_parts", Value: "1"},
@@ -489,7 +489,7 @@ ORDER BY
 					Engine: AggregatingMergeTree{MergeTree{
 						PartitionBy: "toDate(timestamp)",
 						OrderBy:     "(timestamp, src, dest, deployment_environment, k8s_cluster_name, k8s_namespace_name)",
-						TTL:         "toDateTime(timestamp) + toIntervalSecond(604800)",
+						TTL:         "toDateTime(timestamp) + toIntervalSecond(1296000)",
 						Settings: TableSettings{
 							{Name: "index_granularity", Value: "8192"},
 						},
@@ -686,7 +686,7 @@ GROUP BY
 					Engine: SummingMergeTree{MergeTree{
 						PartitionBy: "toDate(timestamp)",
 						OrderBy:     "(timestamp, service_name)",
-						TTL:         "toDateTime(timestamp) + toIntervalSecond(604800)",
+						TTL:         "toDateTime(timestamp) + toIntervalSecond(1296000)",
 						Settings: TableSettings{
 							{Name: "index_granularity", Value: "8192"},
 							{Name: "ttl_only_drop_parts", Value: "1"},

diff --git a/cmd/signozschemamigrator/schema_migrator/table_operations.go b/cmd/signozschemamigrator/schema_migrator/table_operations.go
@@ -37,7 +37,7 @@ func (c CreateTableOperation) OnCluster(cluster string) Operation {
 }
 
 func (c CreateTableOperation) WithReplication() Operation {
-	c.Engine.WithReplication()
+	c.Engine = c.Engine.WithReplication()
 	return &c
 }