Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/data-sources/observability_instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ data "stackit_observability_instance" "example" {
- `metrics_retention_days_5m_downsampling` (Number) Specifies for how many days the 5m downsampled metrics are kept. must be less than the value of the general retention. Default is set to `90`.
- `metrics_url` (String) Specifies metrics URL.
- `name` (String) The name of the Observability instance.
- `otlp_grpc_traces_url` (String)
- `otlp_http_logs_url` (String)
- `otlp_http_traces_url` (String)
- `otlp_traces_url` (String)
- `parameters` (Map of String) Additional parameters.
- `plan_id` (String) The Observability plan ID.
Expand Down
3 changes: 3 additions & 0 deletions docs/resources/observability_instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ import {
- `logs_url` (String) Specifies Logs URL.
- `metrics_push_url` (String) Specifies URL for pushing metrics.
- `metrics_url` (String) Specifies metrics URL.
- `otlp_grpc_traces_url` (String)
- `otlp_http_logs_url` (String)
- `otlp_http_traces_url` (String)
- `otlp_traces_url` (String)
- `plan_id` (String) The Observability plan ID.
- `targets_url` (String) Specifies Targets URL.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,15 @@ func (d *instanceDataSource) Schema(_ context.Context, _ datasource.SchemaReques
"jaeger_ui_url": schema.StringAttribute{
Computed: true,
},
"otlp_grpc_traces_url": schema.StringAttribute{
Computed: true,
},
"otlp_http_logs_url": schema.StringAttribute{
Computed: true,
},
"otlp_http_traces_url": schema.StringAttribute{
Computed: true,
},
"otlp_traces_url": schema.StringAttribute{
Computed: true,
},
Expand Down
24 changes: 24 additions & 0 deletions stackit/internal/services/observability/instance/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ type Model struct {
LogsPushURL types.String `tfsdk:"logs_push_url"`
JaegerTracesURL types.String `tfsdk:"jaeger_traces_url"`
JaegerUIURL types.String `tfsdk:"jaeger_ui_url"`
OtlpGRPCTracesURL types.String `tfsdk:"otlp_grpc_traces_url"`
OtlpHTTPLogsURL types.String `tfsdk:"otlp_http_logs_url"`
OtlpHTTPTracesURL types.String `tfsdk:"otlp_http_traces_url"`
OtlpTracesURL types.String `tfsdk:"otlp_traces_url"`
ZipkinSpansURL types.String `tfsdk:"zipkin_spans_url"`
ACL types.Set `tfsdk:"acl"`
Expand Down Expand Up @@ -609,6 +612,24 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
stringplanmodifier.UseStateForUnknown(),
},
},
"otlp_grpc_traces_url": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
},
"otlp_http_logs_url": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
},
"otlp_http_traces_url": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
},
"otlp_traces_url": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
Expand Down Expand Up @@ -1613,6 +1634,9 @@ func mapFields(ctx context.Context, r *observability.GetInstanceResponse, model
model.LogsPushURL = types.StringPointerValue(i.LogsPushUrl)
model.JaegerTracesURL = types.StringPointerValue(i.JaegerTracesUrl)
model.JaegerUIURL = types.StringPointerValue(i.JaegerUiUrl)
model.OtlpGRPCTracesURL = types.StringPointerValue(i.OtlpGrpcTracesUrl)
model.OtlpHTTPLogsURL = types.StringPointerValue(i.OtlpHttpLogsUrl)
model.OtlpHTTPTracesURL = types.StringPointerValue(i.OtlpHttpTracesUrl)
model.OtlpTracesURL = types.StringPointerValue(i.OtlpTracesUrl)
model.ZipkinSpansURL = types.StringPointerValue(i.ZipkinSpansUrl)
model.GrafanaAdminEnabled = types.BoolPointerValue(i.GrafanaAdminEnabled)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@ func TestMapFields(t *testing.T) {
MetricsRetentionTimeRaw: new(int64(60)),
MetricsRetentionTime1h: new(int64(30)),
MetricsRetentionTime5m: new(int64(7)),
OtlpTracesUrl: new("otlp_traces"),
OtlpGrpcTracesUrl: new("otlp_grpc_traces"),
OtlpHttpTracesUrl: new("otlp_http_traces"),
OtlpHttpLogsUrl: new("otlp_http_logs"),
},
},
&observability.ListACLResponse{
Expand Down Expand Up @@ -433,6 +437,10 @@ func TestMapFields(t *testing.T) {
MetricsRetentionDays: types.Int64Value(60),
MetricsRetentionDays1hDownsampling: types.Int64Value(30),
MetricsRetentionDays5mDownsampling: types.Int64Value(7),
OtlpTracesURL: types.StringValue("otlp_traces"),
OtlpGRPCTracesURL: types.StringValue("otlp_grpc_traces"),
OtlpHTTPTracesURL: types.StringValue("otlp_http_traces"),
OtlpHTTPLogsURL: types.StringValue("otlp_http_logs"),
},
true,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ func TestAccResourceMin(t *testing.T) {
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "logs_push_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_ui_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_grpc_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_logs_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "zipkin_spans_url"),

Expand Down Expand Up @@ -429,6 +432,9 @@ func TestAccResourceMin(t *testing.T) {
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "logs_push_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_ui_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_grpc_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_logs_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "zipkin_spans_url"),

Expand Down Expand Up @@ -513,6 +519,9 @@ func TestAccResourceMax(t *testing.T) {
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "logs_push_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_ui_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_grpc_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_logs_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "zipkin_spans_url"),

Expand Down Expand Up @@ -688,6 +697,9 @@ func TestAccResourceMax(t *testing.T) {
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "logs_push_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "jaeger_traces_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "jaeger_ui_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "otlp_grpc_traces_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "otlp_http_logs_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "otlp_http_traces_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "otlp_traces_url"),
resource.TestCheckResourceAttrSet("data.stackit_observability_instance.instance", "zipkin_spans_url"),

Expand Down Expand Up @@ -920,6 +932,9 @@ func TestAccResourceMax(t *testing.T) {
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "logs_push_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "jaeger_ui_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_grpc_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_logs_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_http_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "otlp_traces_url"),
resource.TestCheckResourceAttrSet("stackit_observability_instance.instance", "zipkin_spans_url"),

Expand Down
Loading