Skip to content

Commit

Permalink
Bump provider to v8
Browse files Browse the repository at this point in the history
Remove data resources signalfx_aws_services, signalfx_azure_services, signalfx_gcp_services as they were based on a no longer maintained lists in the signalfx-go library. Users may use empty list to specify "all services" instead or use strings to specify selected services.
  • Loading branch information
Shr3ps committed Sep 6, 2023
1 parent 68b8c93 commit 691a192
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.terraform
terraform.tfvars
.terraform.lock.hcl
6 changes: 3 additions & 3 deletions cloud/azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ module "signalfx-integrations-cloud-azure" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | ~> 2.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.1 |
| <a name="requirement_signalfx"></a> [signalfx](#requirement\_signalfx) | ~> 6.11 |
| <a name="requirement_signalfx"></a> [signalfx](#requirement\_signalfx) | ~> 8.0 |

## Providers

Expand Down Expand Up @@ -75,9 +75,9 @@ module "signalfx-integrations-cloud-azure" {
| <a name="input_poll_rate"></a> [poll\_rate](#input\_poll\_rate) | Azure poll rate in seconds (One of 60 or 300) | `number` | `300` | no |
| <a name="input_resource_filter_rules"></a> [resource\_filter\_rules](#input\_resource\_filter\_rules) | List of rules for filtering Azure resources by their tags. Each filter follows "filter('key', 'value')". Referenced keys are limited to tags and must start with the "azure\_tag\_" prefix | <pre>list(object({<br> filter = object({<br> source = string<br> })<br> }))</pre> | `null` | no |
| <a name="input_services"></a> [services](#input\_services) | Azure service metrics to import. Empty list imports all services | `list(string)` | `[]` | no |
| <a name="input_signalfx_token_name"></a> [signalfx\_token\_name](#input\_signalfx\_token\_name) | Name of already existing SFX token to use | `string` | `null` | no |
| <a name="input_suffix"></a> [suffix](#input\_suffix) | Optional suffix to identify and avoid duplication of unique resources | `string` | `""` | no |
| <a name="input_sync_guest_os_namespaces"></a> [sync\_guest\_os\_namespaces](#input\_sync\_guest\_os\_namespaces) | Sync additional namespaces for VMs (including VMs in scale sets) to pull metrics from Azure Diagnostics Extensision when enabled | `bool` | `false` | no |
| <a name="input_signalfx_token_name"></a> [signalfx_token_name](#input\_signalfx_token_name) | Optional signalfx token name. To use a sfx token already existing | `string` | `""` | no |

## Outputs

Expand Down
8 changes: 4 additions & 4 deletions cloud/azure/sfx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ module "signalfx-integrations-cloud-azure" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_signalfx"></a> [signalfx](#requirement\_signalfx) | ~> 6.11 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_signalfx"></a> [signalfx](#requirement\_signalfx) | ~> 8.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_signalfx"></a> [signalfx](#provider\_signalfx) | ~> 6.11 |
| <a name="provider_signalfx"></a> [signalfx](#provider\_signalfx) | ~> 8.0 |

## Modules

Expand All @@ -40,7 +40,6 @@ No modules.
|------|------|
| [signalfx_azure_integration.azure_integration](https://registry.terraform.io/providers/splunk-terraform/signalfx/latest/docs/resources/azure_integration) | resource |
| [signalfx_org_token.azure_integration](https://registry.terraform.io/providers/splunk-terraform/signalfx/latest/docs/resources/org_token) | resource |
| [signalfx_azure_services.azure_services](https://registry.terraform.io/providers/splunk-terraform/signalfx/latest/docs/data-sources/azure_services) | data source |

## Inputs

Expand All @@ -59,6 +58,7 @@ No modules.
| <a name="input_poll_rate"></a> [poll\_rate](#input\_poll\_rate) | Azure poll rate in seconds (One of 60 or 300) | `number` | `300` | no |
| <a name="input_resource_filter_rules"></a> [resource\_filter\_rules](#input\_resource\_filter\_rules) | List of rules for filtering Azure resources by their tags. Each filter follows "filter('key', 'value')". Referenced keys are limited to tags and must start with the "azure\_tag\_" prefix | <pre>list(object({<br> filter = object({<br> source = string<br> })<br> }))</pre> | `null` | no |
| <a name="input_services"></a> [services](#input\_services) | Azure service metrics to import. Empty list imports all services | `list(string)` | `[]` | no |
| <a name="input_signalfx_token_name"></a> [signalfx\_token\_name](#input\_signalfx\_token\_name) | Name of already existing SFX token to use | `string` | `null` | no |
| <a name="input_suffix"></a> [suffix](#input\_suffix) | Optional suffix to identify and avoid duplication of unique resources | `string` | `""` | no |
| <a name="input_sync_guest_os_namespaces"></a> [sync\_guest\_os\_namespaces](#input\_sync\_guest\_os\_namespaces) | Sync additional namespaces for VMs (including VMs in scale sets) to pull metrics from Azure Diagnostics Extensision when enabled | `bool` | `false` | no |

Expand Down
5 changes: 1 addition & 4 deletions cloud/azure/sfx/integrations-azure.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
data "signalfx_azure_services" "azure_services" {
}

resource "signalfx_azure_integration" "azure_integration" {
name = local.integration_name
enabled = var.enabled
Expand All @@ -12,7 +9,7 @@ resource "signalfx_azure_integration" "azure_integration" {
app_id = var.azure_sp_application_id
secret_key = var.azure_sp_application_token

services = setsubtract(local.azure_services, var.excluded_services)
services = setsubtract(var.services, var.excluded_services)
additional_services = var.additional_services

dynamic "resource_filter_rules" {
Expand Down
1 change: 0 additions & 1 deletion cloud/azure/sfx/locals.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
locals {
integration_name = format("AzureSignalFxIntegration%s", title(var.suffix))
azure_services = coalescelist(var.services, data.signalfx_azure_services.azure_services.services[*].name)
}
4 changes: 2 additions & 2 deletions cloud/azure/sfx/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ terraform {
required_providers {
signalfx = {
source = "splunk-terraform/signalfx"
version = "~> 6.11"
version = "~> 8.0"
}
}
required_version = ">= 0.13"
required_version = ">= 1.0"
}
4 changes: 2 additions & 2 deletions cloud/azure/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
signalfx = {
source = "splunk-terraform/signalfx"
version = "~> 6.11"
version = "~> 8.0"
}
azurerm = {
source = "hashicorp/azurerm"
Expand All @@ -13,5 +13,5 @@ terraform {
version = "~> 2.0"
}
}
required_version = ">= 0.13"
required_version = ">= 1.0"
}

0 comments on commit 691a192

Please sign in to comment.