Skip to content
Merged
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
44 changes: 41 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
.terraform
terraform.tfstate
terraform.tfstate.backup
# terraform
# Local .terraform directories
.terraform/

# .tfstate files
*.tfstate
*.tfstate.*

# Crash log files
crash.log
crash.*.log

# Exclude all .tfvars files, which are likely to contain sensitive data, such as
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# to change depending on the environment.
*.tfvars
*.tfvars.json

# Ignore override files as they are usually used to override resources locally and so
# are not checked in
override.tf
override.tf.json
*_override.tf
*_override.tf.json

# Ignore transient lock info files created by terraform apply
.terraform.tfstate.lock.info

# Include override files you do wish to add to version control using negated pattern
# !example_override.tf

# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
# example: *tfplan*

# Ignore CLI configuration files
.terraformrc
terraform.rc

# Optional: ignore graph output files generated by `terraform graph`
# *.dot

# ignore direnv
.envrc
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
exclude: "^minotaur/"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-executables-have-shebangs
- id: check-json
Expand All @@ -10,15 +10,15 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.96.2
rev: v1.105.0
hooks:
- id: terraform_fmt
args:
- --args=-recursive
- --args=-write=false

- repo: https://github.com/gruntwork-io/pre-commit
rev: v0.1.23
rev: v0.1.30
hooks:
- id: shellcheck

Expand Down
66 changes: 0 additions & 66 deletions terraform/azure_0DIN/.terraform.lock.hcl

This file was deleted.

30 changes: 22 additions & 8 deletions terraform/azure_0DIN/finops.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ resource "azapi_resource" "azure_zero_din_cost_export_actual" {
status = "Active"
recurrence = "Daily"
recurrencePeriod = {
from = "2025-09-02T00:00:00.000Z"
to = "2050-02-01T00:00:00.000Z"
from = "2025-09-02T00:00:00Z"
to = "2050-02-01T00:00:00Z"
}
}
format = "Csv"
compressionMode = "None"
format = "Csv"
compressionMode = "None"
dataOverwriteBehavior = "CreateNewReport"
deliveryInfo = {
destination = {
type = "AzureBlob"
resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
container = "cost-management"
rootFolderPath = "azure_0din_daily_actual"
Expand All @@ -28,6 +30,11 @@ resource "azapi_resource" "azure_zero_din_cost_export_actual" {
timeframe = "MonthToDate"
dataSet = {
granularity = "Daily"
configuration = {
columns = []
dataVersion = "2021-10-01"
filters = []
}
}
}
}
Expand All @@ -45,14 +52,16 @@ resource "azapi_resource" "azure_zero_din_cost_export_amortized" {
status = "Active"
recurrence = "Daily"
recurrencePeriod = {
from = "2025-09-02T00:00:00.000Z"
to = "2050-02-01T00:00:00.000Z"
from = "2025-09-02T00:00:00Z"
to = "2050-02-01T00:00:00Z"
}
}
format = "Csv"
compressionMode = "None"
format = "Csv"
compressionMode = "None"
dataOverwriteBehavior = "CreateNewReport"
deliveryInfo = {
destination = {
type = "AzureBlob"
resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
container = "cost-management"
rootFolderPath = "azure_0din_daily_amortized"
Expand All @@ -64,6 +73,11 @@ resource "azapi_resource" "azure_zero_din_cost_export_amortized" {
timeframe = "MonthToDate"
dataSet = {
granularity = "Daily"
configuration = {
columns = []
dataVersion = "2021-10-01"
filters = []
}
}
}
}
Expand Down
90 changes: 44 additions & 46 deletions terraform/azure_fx_nonci/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions terraform/azure_fx_nonci/finops.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
resource "azapi_resource" "fx_nonci_cost_export_amortized" {
type = "Microsoft.CostManagement/exports@2025-03-01"
name = "fx_non_ci-amortized-cost"
parent_id = "/subscriptions/0a420ff9-bc77-4475-befc-a05071fc92ec"

identity {
type = "SystemAssigned"
}

body = {
properties = {
schedule = {
status = "Active"
recurrence = "Daily"
recurrencePeriod = {
from = "2024-10-01T00:00:00Z"
to = "2050-02-01T00:00:00Z"
}
}
format = "Csv"
compressionMode = "None"
dataOverwriteBehavior = "CreateNewReport"
exportDescription = ""
deliveryInfo = {
destination = {
type = "AzureBlob"
resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
container = "cost-management"
rootFolderPath = "fx_non_ci_daily_amortized"
}
}
partitionData = true
definition = {
type = "AmortizedCost"
timeframe = "MonthToDate"
dataSet = {
granularity = "Daily"
configuration = {
columns = []
dataVersion = "2021-10-01"
filters = []
}
}
}
}
}
}
Loading