diff --git a/TEST_STAND/IOT_KAFKA_DEMO/infra.tf b/TEST_STAND/IOT_KAFKA_DEMO/infra.tf index 7c54ce7..081a6eb 100644 --- a/TEST_STAND/IOT_KAFKA_DEMO/infra.tf +++ b/TEST_STAND/IOT_KAFKA_DEMO/infra.tf @@ -30,52 +30,52 @@ resource "nubes_rabbitmq" "main" { # --- Redis: кэш дашборда (сервис 91) --- # state_out_flat["internalConnect.master"] = хост -# vault_secrets["adminPass"] = пароль (прямая строка) +# vault_secrets["adminPass"] = пароль (прямая строка, не JSON) resource "nubes_redis" "main" { - resource_name = local.rds_resource_name + resource_name = local.rds_resource_name # имя в личном кабинете (rds = ReDiS) - startup_configuration = { + startup_configuration = { # на каком K8s-кластере resource_realm = var.realm } - cluster_configuration = { - cpu = local.rds_cpu - memory = local.rds_memory - disk = local.rds_disk - replicas = local.rds_replicas + cluster_configuration = { # ресурсы пода + cpu = local.rds_cpu # CPU millicores + memory = local.rds_memory # память MB + disk = local.rds_disk # диск GB + replicas = local.rds_replicas # количество нод } - access_configuration = { - master_ip_space = "no-needed" # не резервировать внешний IP - master_access_list = jsonencode(["10.0.0.0/8"]) # доступ изнутри кластера - slave_ip_space = "no-needed" # slave не нужен - slave_access_list = jsonencode([]) # slave не нужен + access_configuration = { # сетевой доступ + master_ip_space = "no-needed" # не резервировать внешний IP + master_access_list = jsonencode(["10.0.0.0/8"]) # разрешить всю внутреннюю сеть K8s + slave_ip_space = "no-needed" # slave-нода не нужна + slave_access_list = jsonencode([]) # slave-нода не нужна } - operation_timeout = local.rds_timeout + operation_timeout = local.rds_timeout # макс. время ожидания операций } # --- MongoDB: архив событий (сервис 92) --- # state_out_flat["internalConnect"] = хост # vault_secrets — пустой (нет дефолтных пользователей), подключаемся без пароля resource "nubes_mongodb" "main" { - resource_name = local.mgo_resource_name + resource_name = local.mgo_resource_name # имя в личном кабинете (mgo = MonGO) - startup_configuration = { + startup_configuration = { # на каком K8s-кластере resource_realm = var.realm } - cluster_configuration = { - cpu = local.mgo_cpu - memory = local.mgo_memory - disk = local.mgo_disk - replicas = local.mgo_replicas + cluster_configuration = { # ресурсы пода + cpu = local.mgo_cpu # CPU millicores + memory = local.mgo_memory # память MB + disk = local.mgo_disk # диск GB + replicas = local.mgo_replicas # количество нод } - access_configuration = { - master_ip_space = "no-needed" - master_access_list = jsonencode(["10.0.0.0/8"]) + access_configuration = { # сетевой доступ + master_ip_space = "no-needed" # не резервировать внешний IP + master_access_list = jsonencode(["10.0.0.0/8"]) # разрешить всю внутреннюю сеть K8s } - operation_timeout = local.mgo_timeout + operation_timeout = local.mgo_timeout # макс. время ожидания } diff --git a/TEST_STAND/IOT_KAFKA_DEMO/mongodb.tf b/TEST_STAND/IOT_KAFKA_DEMO/mongodb.tf deleted file mode 100644 index 4d9455a..0000000 --- a/TEST_STAND/IOT_KAFKA_DEMO/mongodb.tf +++ /dev/null @@ -1,24 +0,0 @@ -# ============================================================================= -# MongoDB — постоянное хранение IoT-событий -# ============================================================================= -resource "nubes_mongodb" "main" { - resource_name = local.mongo_resource_name - - startup_configuration = { - resource_realm = var.realm - } - - cluster_configuration = { - cpu = local.mongo_cpu - memory = local.mongo_memory - disk = local.mongo_disk - replicas = local.mongo_replicas - } - - access_configuration = { - master_ip_space = "no-needed" - master_access_list = jsonencode(["10.0.0.0/8"]) - } - - operation_timeout = local.mongo_timeout -} diff --git a/TEST_STAND/IOT_KAFKA_DEMO/rabbitmq.tf b/TEST_STAND/IOT_KAFKA_DEMO/rabbitmq.tf deleted file mode 100644 index 832ccc3..0000000 --- a/TEST_STAND/IOT_KAFKA_DEMO/rabbitmq.tf +++ /dev/null @@ -1,24 +0,0 @@ -# ============================================================================= -# RabbitMQ — очередь сообщений -# ============================================================================= -resource "nubes_rabbitmq" "main" { - resource_name = local.rabbit_resource_name - - startup_configuration = { - resource_realm = var.realm - } - - cluster_configuration = { - cpu = local.rabbit_cpu - memory = local.rabbit_memory - disk = local.rabbit_disk - replicas = local.rabbit_replicas - } - - access_configuration = { - master_ip_space = "no-needed" - master_access_list = jsonencode(["10.0.0.0/8"]) - } - - operation_timeout = local.rabbit_timeout -} diff --git a/TEST_STAND/IOT_KAFKA_DEMO/redis.tf b/TEST_STAND/IOT_KAFKA_DEMO/redis.tf deleted file mode 100644 index 6cce930..0000000 --- a/TEST_STAND/IOT_KAFKA_DEMO/redis.tf +++ /dev/null @@ -1,26 +0,0 @@ -# ============================================================================= -# Redis — кэш дашборда -# ============================================================================= -resource "nubes_redis" "main" { - resource_name = local.redis_resource_name - - startup_configuration = { - resource_realm = var.realm - } - - cluster_configuration = { - cpu = local.redis_cpu - memory = local.redis_memory - disk = local.redis_disk - replicas = local.redis_replicas - } - - access_configuration = { - master_ip_space = "no-needed" - master_access_list = jsonencode(["10.0.0.0/8"]) - slave_ip_space = "no-needed" - slave_access_list = jsonencode([]) - } - - operation_timeout = local.redis_timeout -} diff --git a/apps/iot-consumer b/apps/iot-consumer new file mode 160000 index 0000000..03fefc0 --- /dev/null +++ b/apps/iot-consumer @@ -0,0 +1 @@ +Subproject commit 03fefc07fdda234c698d320c3269d1c0c99099d1 diff --git a/apps/iot-dashboard b/apps/iot-dashboard new file mode 160000 index 0000000..bc6f43d --- /dev/null +++ b/apps/iot-dashboard @@ -0,0 +1 @@ +Subproject commit bc6f43d5611b40fe35957547e77fa1a00f8d3244 diff --git a/apps/iot-producer b/apps/iot-producer index a6ed190..0bf1847 160000 --- a/apps/iot-producer +++ b/apps/iot-producer @@ -1 +1 @@ -Subproject commit a6ed1907572b2f765f562aff60284278a68b5e8b +Subproject commit 0bf1847abbaabc78637b41607dab22c400493ca3