Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only import sources when collector exists #1137

Merged
merged 2 commits into from
Nov 19, 2020
Merged

Only import sources when collector exists #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd96c9
Only import sources when collector exists
pmalek Nov 19, 2020
9d32b8b
Fix tests
pmalek Nov 19, 2020
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
5 changes: 3 additions & 2 deletions deploy/helm/sumologic/conf/setup/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ fi
readonly COLLECTOR_NAME="{{ template "terraform.collector.name" . }}"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"

# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
{{- $ctx := .Values -}}
{{- range $type, $sources := .Values.sumologic.sources }}
{{- if eq (include "terraform.sources.component_enabled" (dict "Context" $ctx "Type" $type)) "true" }}
Expand All @@ -72,6 +72,7 @@ terraform import sumologic_http_source.{{ template "terraform.sources.name" (dic
{{- end }}
{{- end }}
{{- end }}
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret {{ template "terraform.secret.fullname" . }}
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/all_fields.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
terraform import sumologic_http_source.default_events_source "${COLLECTOR_NAME}/events"
terraform import sumologic_http_source.default_logs_source "${COLLECTOR_NAME}/logs"
terraform import sumologic_http_source.apiserver_metrics_source "${COLLECTOR_NAME}/apiserver-metrics"
Expand All @@ -344,6 +345,7 @@ data:
terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
terraform import sumologic_http_source.test_source_metrics_source "${COLLECTOR_NAME}/(Test source)"
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/collector_fields.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
terraform import sumologic_http_source.default_events_source "${COLLECTOR_NAME}/events"
terraform import sumologic_http_source.default_logs_source "${COLLECTOR_NAME}/logs"
terraform import sumologic_http_source.apiserver_metrics_source "${COLLECTOR_NAME}/apiserver-metrics"
Expand All @@ -298,6 +299,7 @@ data:
terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/conditional_sources.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/custom.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/default.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
terraform import sumologic_http_source.default_events_source "${COLLECTOR_NAME}/events"
terraform import sumologic_http_source.default_logs_source "${COLLECTOR_NAME}/logs"
terraform import sumologic_http_source.apiserver_metrics_source "${COLLECTOR_NAME}/apiserver-metrics"
Expand All @@ -296,6 +297,7 @@ data:
terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/disable_default_metrics.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
terraform import sumologic_http_source.default_events_source "${COLLECTOR_NAME}/events"
terraform import sumologic_http_source.default_logs_source "${COLLECTOR_NAME}/logs"
terraform import sumologic_http_source.apiserver_metrics_source "${COLLECTOR_NAME}/apiserver-metrics"
Expand All @@ -288,6 +289,7 @@ data:
terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/strip_extrapolation.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
terraform import sumologic_http_source.default_events_source "${COLLECTOR_NAME}/events"
terraform import sumologic_http_source.default_logs_source "${COLLECTOR_NAME}/logs"
terraform import sumologic_http_source.apiserver_metrics_source "${COLLECTOR_NAME}/apiserver-metrics"
Expand All @@ -297,6 +298,7 @@ data:
terraform import sumologic_http_source.node_metrics_source "${COLLECTOR_NAME}/node-exporter-metrics"
terraform import sumologic_http_source.scheduler_metrics_source "${COLLECTOR_NAME}/kube-scheduler-metrics"
terraform import sumologic_http_source.state_metrics_source "${COLLECTOR_NAME}/kube-state-metrics"
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down
4 changes: 3 additions & 1 deletion tests/terraform/static/traces.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,10 @@ data:
readonly COLLECTOR_NAME="kubernetes"

# Sumo Logic Collector and HTTP sources
terraform import sumologic_collector.collector "${COLLECTOR_NAME}"
# Only import sources when collector exists.
if terraform import sumologic_collector.collector "${COLLECTOR_NAME}"; then
terraform import sumologic_http_source.default_traces_source "${COLLECTOR_NAME}/traces"
fi

# Kubernetes Secret
terraform import kubernetes_secret.sumologic_collection_secret sumologic/sumologic
Expand Down