From 939d98c593451a90fd7c5c1e85b74cb7a8b33d27 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Tue, 8 Nov 2022 13:57:01 +0900
Subject: [PATCH 01/10] Refactor logging-service

---
 logging-service/deploy.sh                     |  45 ++-
 logging-service/logging-service.yml           | 340 ++++++++----------
 logging-service/operations/aws-network.yml    |  15 -
 logging-service/operations/azure-network.yml  |  15 -
 logging-service/operations/gcp-network.yml    |  14 -
 .../operations/openstack-network.yml          |  14 -
 .../operations/portal-app-type.yml            |  13 +
 .../operations/use-protocol-tcp.yml           |   5 +
 .../operations/vsphere-network.yml            |  15 -
 logging-service/vars.yml                      |  99 ++---
 10 files changed, 237 insertions(+), 338 deletions(-)
 delete mode 100644 logging-service/operations/aws-network.yml
 delete mode 100644 logging-service/operations/azure-network.yml
 delete mode 100644 logging-service/operations/gcp-network.yml
 delete mode 100644 logging-service/operations/openstack-network.yml
 create mode 100644 logging-service/operations/portal-app-type.yml
 create mode 100644 logging-service/operations/use-protocol-tcp.yml
 delete mode 100644 logging-service/operations/vsphere-network.yml

diff --git a/logging-service/deploy.sh b/logging-service/deploy.sh
index 2118a2f..f840591 100644
--- a/logging-service/deploy.sh
+++ b/logging-service/deploy.sh
@@ -1,12 +1,39 @@
 #!/bin/bash
 
 # VARIABLES
-COMMON_VARS_PATH="<COMMON_VARS_FILE_PATH>"       # common_vars.yml File Path (e.g. ../../common/common_vars.yml)
-CURRENT_IAAS="${CURRENT_IAAS}"					 # IaaS Information (PaaS-TA에서 제공되는 create-bosh-login.sh 미 사용시 aws/azure/gcp/openstack/vsphere 입력)
-BOSH_ENVIRONMENT="${BOSH_ENVIRONMENT}"			 # bosh director alias name (PaaS-TA에서 제공되는 create-bosh-login.sh 미 사용시 bosh envs에서 이름을 확인하여 입력)
-
-# DEPLOY
-bosh -e ${BOSH_ENVIRONMENT} -n -d logging-service deploy --no-redact logging-service.yml \
-    -o operations/${CURRENT_IAAS}-network.yml \
-    -l ${COMMON_VARS_PATH} \
-    -l vars.yml
+COMMON_VARS_PATH="<COMMON_VARS_FILE_PATH>"             # common_vars.yml File Path (e.g. ../../common/common_vars.yml)
+BOSH_ENVIRONMENT="${BOSH_ENVIRONMENT}"                   # bosh director alias name (PaaS-TA에서 제공되는 create-bosh-login.sh 미 사용시 bosh envs에서 이름을 확인하여 입력)
+
+
+# Portal 설치 타입 및 프로토콜 종류에 따라 옵션 파일 사용 여부를 분기한다.
+PORTAL_TYPE=`grep portal_deploy_type vars.yml | cut -d "#" -f1`
+FLUENTD_TRANSPORT=`grep fluentd_transport vars.yml`
+
+
+if [[ "${PORTAL_TYPE}" =~ "app" ]]; then
+  if [[ "${FLUENTD_TRANSPORT}" =~ "tcp" ]]; then
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -o operations/portal-app-type.yml \
+          -o operations/use-protocol-tcp.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  else
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -o operations/portal-app-type.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  fi
+elif [[ "${PORTAL_TYPE}" =~ "vm" ]]; then
+  if [[ "${FLUENTD_TRANSPORT}" =~ "tcp" ]]; then
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -o operations/use-protocol-tcp.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  else
+    bosh -e ${BOSH_ENVIRONMENT} -d logging-service -n deploy logging-service.yml \
+          -l vars.yml \
+          -l ${COMMON_VARS_PATH}
+  fi
+else
+  echo "Logging Service can't install. Please check 'portal_deploy_type'."
+fi
\ No newline at end of file
diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index 1c761e2..7640fa3 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -1,177 +1,119 @@
 ---
-name: logging-service 
-
-releases:
-- name: paasta-logging-service-release
-  url: https://nextcloud.paas-ta.org/index.php/s/eoCBY5QSFjJr3AS/download
-  version: "1.0"
+name: logging-service
 
 stemcells:
 - alias: default
   os: ((stemcell_os))
   version: ((stemcell_version))
 
-update: 
-  canaries: 1                            # canary 인스턴스 수(필수)
-  canary_watch_time: 30000-600000        # canary 인스턴스가 수행하기 위한 대기 시간(필수)
-  max_in_flight: 1                       # non-canary 인스턴스가 병렬로 update 하는 최대 개수(필수)
-  update_watch_time: 5000-600000        # non-canary 인스턴스가 수행하기 위한 대기 시간(필수)
-  serial: false
+releases:
+- name: paasta-portal-api-release
+  sha1: e04ae6b2f796e78ebe3243d9f0325224a6979c99
+  version: 2.5.10
+  url: https://nextcloud.paas-ta.org/index.php/s/GiKm67pjZ3mRP2m/download
+- name: monitoring-dashboard-release
+  version: 5.8.1
+  sha1: 59e6a10ff7ee11093fedcad0ede8e8265179b973
+  url: https://nextcloud.paas-ta.org/index.php/s/DPKMAafeHwKNWs4/download
+- name: monitoring-influxdb-release
+  version: 5.8.1
+  sha1: 813d7b2ebf18c0859df209853818c53a22f42b2f
+  url: https://nextcloud.paas-ta.org/index.php/s/qSsJerfdNKXxC5o/download
+- name: paasta-collector-release
+  version: 5.8.2
+  sha1: f56523758bc839be53e44583df1b65837ed303af
+  url: https://nextcloud.paas-ta.org/index.php/s/gesnBRQsKEJPoTE/download
+- name: syslog
+  version: 12.0.2
+  sha1: ef0c0cfaf83002175fd88aae005774e33f1d4787
+  url: https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=12.0.2
+- name: bpm
+  version: 1.1.15
+  sha1: 0d48aa01a65b947b97570234eb2401e821a8bd35
+  url: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.1.15
 
 instance_groups:
-- name: elasticsearch_master
-  azs: ((es_master_azs))
-  instances: ((es_master_instances))
-  persistent_disk_type: ((es_master_persistent_disk_type))
-  vm_type: ((vm_type_default))
-  stemcell: default
-  networks:
-  - name: ((private_networks_name))
-    static_ips: ((es_master_private_ips))
-  jobs:
-  - name: elasticsearch
-    release: paasta-logging-service-release
-    properties: 
-      elasticsearch:
-        cluster_name: logsearch
-        exec: null
-        master_hosts: ((es_master_private_ips))
-        node:
-          allow_data: false
-          allow_master: true
-  - name: cerebro
-    release: paasta-logging-service-release
-    properties:
-      elasticsearch:
-        cluster_name: logsearch
-  update:
-    max_in_flight: 1
-
-- name: queue
-  azs: ((queue_azs))
-  instances: ((queue_instances))
-  persistent_disk_type: ((queue_persistent_disk_type))
-  vm_type: ((vm_type_default))
+- name: fluentd
+  azs: ((fluentd_azs))
+  instances: ((fluentd_instances))
+  vm_type: ((fluentd_vm_type))
   stemcell: default
   networks:
-  - name: ((private_networks_name))
-    static_ips: ((queue_private_ips))
+  - name: ((fluentd_network))
+    static_ips:
+    - ((fluentd_ip))
   jobs:
-  - name: queue
-    release: paasta-logging-service-release
-    properties:
-      redis:
-        host: ((queue_private_url))
-
-- name: maintenance
-  azs: ((maintenance_azs))
-  instances: ((maintenance_instances))
-  vm_type: ((vm_type_minimal))
-  stemcell: default
-  networks:
-  - name: ((private_networks_name))
-    static_ips: ((maintenance_private_ips))
-  jobs:
-  - name: elasticsearch_config
-    release: paasta-logging-service-release
-    properties:
-      elasticsearch_config:
-        elasticsearch:
-          host: ((es_master_private_url))
-        index_prefix: ((es_config_index_prefix))
-        templates:
-        - shards-and-replicas: /var/vcap/jobs/elasticsearch_config/index-templates/shards-and-replicas.json
-        - index-settings: /var/vcap/jobs/elasticsearch_config/index-templates/index-settings.json
-        - index-mappings: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings.json
-        - index-mappings-laas: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings-laas.json
-        - index-mappings-app: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings-app.json
-        - index-mappings-platform: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings-platform.json
-  - name: curator
-    release: paasta-logging-service-release
+  - name: fluentd
+    release: monitoring-dashboard-release
     properties:
-      elasticsearch_config:
-        index_prefix: ((es_config_index_prefix))
-      curator:
-        elasticsearch:
-          host: ((es_master_private_url))
-          port: 9200
-        purge_logs:
-          retention_period: ((retention_period))
-          unit: days
-  update:
-    serial: true
+      logging:
+        db:
+          name: ((influxdb_database))
+        measurement:
+          name: ((influxdb_measurement))
+        time:
+          precision: ((influxdb_time_precision))
+      influxdb:
+        http:
+          host: ((influxdb_ip))
+          port: ((influxdb_http_port))
+        user: ((influxdb_username))
+        password: ((influxdb_password))
+        ssl:
+          enabled: false
+      fluentd:
+        port: ((fluentd_port))
+        transport: ((fluentd_transport))
+  - name: bpm
+    release: bpm
 
-- name: elasticsearch_data
-  azs: ((es_data_azs))
-  instances: ((es_data_instances))
-  persistent_disk_type: ((es_data_persistent_disk_type))
-  vm_type: ((vm_type_medium))
+- name: influxdb
+  azs: ((influxdb_azs))
+  instances: ((influxdb_instances))
+  vm_type: ((influxdb_vm_type))
   stemcell: default
+  persistent_disk_type: ((influxdb_persistent_disk_type))
   networks:
-  - name: ((private_networks_name))
-    static_ips: ((es_data_private_ips))
+  - name: ((influxdb_network))
+    static_ips:
+    - ((influxdb_ip))
   jobs:
-  - name: elasticsearch
-    release: paasta-logging-service-release
+  - name: influxdb
+    release: monitoring-influxdb-release
     properties:
-      elasticsearch:
-        cluster_name: logsearch
-        exec: null
-        master_hosts: ((es_master_private_ips))
-        node:
-          allow_data: true
-          allow_master: false
-  update:
-    max_in_flight: 1
-    serial: true
-
-- name: visualization
-  azs: ((visualization_azs))
-  instances: ((visualization_instances))
-  vm_type: ((vm_type_default))
-  stemcell: default
-  networks:
-  - name: ((private_networks_name))
-    static_ips: ((visualization_private_ips))
-  jobs:
-  - name: kibana
-    release: paasta-logging-service-release
+      influxdb:
+        user: ((influxdb_username))
+        password: ((influxdb_password))
+        interval: ((influxdb_interval)) 
+        replication: 1
+        ips: 127.0.0.1
+        https_enabled: false
+        http:
+          bind-address: ((influxdb_http_port))
+        pem_key: ((influxdb_ssl.certificate))((influxdb_ssl.private_key))
+        logging_db_name: ((influxdb_database))
+  - name: chronograf
+    release: monitoring-influxdb-release
     properties:
-      kibana:
-        elasticsearch: 
-          host: ((es_master_private_url))
-          port: 9200
-        version: ((visualization_version))
-      laas: 
-        cf_api_url: "https://api.((system_domain))"
-        cf_client_id: ((uaa_client_laas_id))
-        cf_client_secret: ((uaa_client_laas_secret))
-        cf_uaa_callback_url: http://((router_public_ips))/app/laas/callback
-        cf_uaa_scope: cloud_controller.read&openid
-        cf_uaa_url: "https://uaa.((system_domain))"
-        elasticsearch_index_prefix: ((es_config_index_prefix))
-        top_left_logo_image: ((laas_logo))
+      influxdb:
+        user: ((influxdb_username))
+        password: ((influxdb_password))
+        https_enabled: false
+        http:
+          bind-address: ((influxdb_http_port))
+  - name: bpm
+    release: bpm
 
 - name: collector
   azs: ((collector_azs))
   instances: ((collector_instances))
-  vm_type: ((vm_type_default))
+  vm_type: ((collector_vm_type))
   stemcell: default
   networks:
-  - name: ((private_networks_name))
-    static_ips: ((collector_private_ips))
+  - name: ((collector_network))
   jobs:
-  - name: ingestor_syslog 
-    release: paasta-logging-service-release
-    properties:
-      logstash_ingestor:
-        debug: false
-        relp:
-          port: null
-      redis:
-        host: ((queue_private_url))
   - name: ingestor_cloudfoundry-firehose
-    release: paasta-logging-service-release
+    release: paasta-collector-release
     properties:
       cloudfoundry:
         api_endpoint: https://api.((system_domain))
@@ -182,60 +124,66 @@ instance_groups:
       create-uaa-client:
         cloudfoundry:
           system_domain: ((system_domain))
-          uaa_admin_client_id: ((uaa_client_admin_id)) 
+          uaa_admin_client_id: ((uaa_client_admin_id))
           uaa_admin_client_secret: ((uaa_client_admin_secret))
       syslog:
-        host: ((router_private_url))
-        port: 5514
-
-- name: parser
-  azs: ((parser_azs))
-  instances: ((parser_instances))
-  vm_type: ((vm_type_default))
-  stemcell: default
-  networks:
-  - name: ((private_networks_name))
-    static_ips: ((parser_private_ips))
-  jobs:
-  - name: parser
-    release: paasta-logging-service-release
+        host: ((fluentd_ip))
+        port: ((fluentd_port))
+        protocol: ((fluentd_transport))
+  - name: syslog_forwarder
+    release: syslog
     properties:
-      logstash_parser:
-        debug: false
-        elasticsearch:
-          index: ((es_config_index_prefix))((parser_es_index))
-          index_type: ((parser_es_index_type))
-      redis:
-        host: ((queue_private_url))
-  - name: elasticsearch
-    release: paasta-logging-service-release
-    properties:
-      elasticsearch:
-        cluster_name: logsearch
-        exec: null
-        master_hosts: ((es_master_private_ips))
-  update:
-    max_in_flight: 4
-    serial: false
+      syslog:
+        address: ((fluentd_ip))
+        custom_rule: |
+          ((syslog_forwarder_custom_rule))
+          if ($programname startswith "vcap.") then stop
+        fallback_servers: ((syslog_forwarder_fallback_servers))
+        port: ((fluentd_port))
+        tls_enabled: false
+        transport: ((fluentd_transport))
 
-- name: router
-  azs: ((router_azs))
-  instances: ((router_instances))
-  vm_type: ((vm_type_minimal))                          
+- name : api
+  azs: ((api_azs))
+  instances: ((api_instances))
+  vm_type: ((api_vm_type))
   stemcell: default
   networks:
-  - name: ((private_networks_name))
-    static_ips: ((router_private_ips))
-  - name: ((public_networks_name))
-    static_ips: ((router_public_ips))
+  - name: ((api_network))
   jobs:
-  - name: haproxy
-    release: paasta-logging-service-release
-    properties:
-      haproxy:
-        cluster_monitor:
-        ingestor:
-          backend_servers: ((collector_private_ips))
-        kibana:
-          backend_servers: ((visualization_private_ips))
+  - name: paas-ta-portal-log-api
+    release: paasta-portal-api-release
+    consumes:
+      paas-ta-portal-registration-link: {from: portal-registration, deployment: portal-api}
+  properties:
+    influxdb:
+      ip: ((influxdb_ip))
+      port: ((influxdb_http_port))
+      username: ((influxdb_username))
+      password: ((influxdb_password))
+      database: ((influxdb_database))
+      measurement: ((influxdb_measurement))
+      limit: ((influxdb_query_limit))
+
+
+variables:
+- name: influxdb_ca
+  options:
+    common_name: influxdbCA
+    is_ca: true
+  type: certificate
+- name: influxdb_ssl
+  options:
+    alternative_names:
+    - ((system_domain))
+    - '*.((system_domain))'
+    ca: influxdb_ca
+    common_name: influxdbSSL
+  type: certificate
 
+update:
+  canaries: 1
+  canary_watch_time: 30000-600000
+  max_in_flight: 1
+  serial: true
+  update_watch_time: 5000-600000
diff --git a/logging-service/operations/aws-network.yml b/logging-service/operations/aws-network.yml
deleted file mode 100644
index 10b641c..0000000
--- a/logging-service/operations/aws-network.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((private_networks_name))
-  value:
-    name: ((private_nat_networks_name))
-    default: [dns, gateway]
-    static_ips: ((router_private_ips))
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((public_networks_name))
-  value:
-    name: ((public_networks_name))
-    static_ips: ((router_public_ips))
-
diff --git a/logging-service/operations/azure-network.yml b/logging-service/operations/azure-network.yml
deleted file mode 100644
index 10b641c..0000000
--- a/logging-service/operations/azure-network.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((private_networks_name))
-  value:
-    name: ((private_nat_networks_name))
-    default: [dns, gateway]
-    static_ips: ((router_private_ips))
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((public_networks_name))
-  value:
-    name: ((public_networks_name))
-    static_ips: ((router_public_ips))
-
diff --git a/logging-service/operations/gcp-network.yml b/logging-service/operations/gcp-network.yml
deleted file mode 100644
index 903664a..0000000
--- a/logging-service/operations/gcp-network.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((private_networks_name))
-  value:
-    name: ((private_nat_networks_name))
-    default: [dns, gateway]
-    static_ips: ((router_private_ips))
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((public_networks_name))
-  value:
-    name: ((public_networks_name))
-    static_ips: ((router_public_ips))
diff --git a/logging-service/operations/openstack-network.yml b/logging-service/operations/openstack-network.yml
deleted file mode 100644
index 72f48a6..0000000
--- a/logging-service/operations/openstack-network.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((private_networks_name))
-  value:
-    name: ((private_networks_name))
-    default: [dns, gateway]
-    static_ips: ((router_private_ips))
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((public_networks_name))
-  value:
-    name: ((public_networks_name))
-    static_ips: ((router_public_ips))
diff --git a/logging-service/operations/portal-app-type.yml b/logging-service/operations/portal-app-type.yml
new file mode 100644
index 0000000..a49b38b
--- /dev/null
+++ b/logging-service/operations/portal-app-type.yml
@@ -0,0 +1,13 @@
+---
+
+- type: replace
+  path: /instance_groups/name=api/jobs/name=paas-ta-portal-log-api/consumes
+  value:
+    paas-ta-portal-registration-link: nil
+
+- type: replace
+  path: /instance_groups/name=api/properties?
+  value:
+    paasta:
+      domain: ((system_domain))
+    portalType: app
\ No newline at end of file
diff --git a/logging-service/operations/use-protocol-tcp.yml b/logging-service/operations/use-protocol-tcp.yml
new file mode 100644
index 0000000..4d73c50
--- /dev/null
+++ b/logging-service/operations/use-protocol-tcp.yml
@@ -0,0 +1,5 @@
+---
+
+- type: replace
+  path: /instance_groups/name=collector/jobs/name=syslog_forwarder/properties/syslog/use_tcp_for_file_forwarding_local_transport?
+  value: true
\ No newline at end of file
diff --git a/logging-service/operations/vsphere-network.yml b/logging-service/operations/vsphere-network.yml
deleted file mode 100644
index ebcda1f..0000000
--- a/logging-service/operations/vsphere-network.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((private_networks_name))
-  value: 
-    name: ((private_networks_name))
-    static_ips: ((router_private_ips))
-
-- type: replace
-  path: /instance_groups/name=router/networks/name=((public_networks_name))
-  value:
-    name: ((public_networks_name))
-    default: [dns, gateway]
-    static_ips: ((router_public_ips))
-
diff --git a/logging-service/vars.yml b/logging-service/vars.yml
index 08bab58..a8b60c9 100644
--- a/logging-service/vars.yml
+++ b/logging-service/vars.yml
@@ -1,73 +1,52 @@
 # STEMCELL
-stemcell_os: "ubuntu-xenial"                                     # stemcell os
-stemcell_version: "621.94"                                       # stemcell version
+stemcell_os: "ubuntu-bionic"		# Stemcell OS
+stemcell_version: "1.107"		# Stemcell Version
 
-# VM_TYPE
-vm_type_minimal: "minimal"                                       # vm type minimal
-vm_type_default: "small"                                         # vm type small
-vm_type_medium: "medium"                                         # vm type medium
 
-# NETWORK
-private_networks_name: "default"                                 # private network name 
-public_networks_name: "vip"                                      # public network name
-private_nat_networks_name: "default"                             # AWS의 경우, NATS Network Name
+# VARIABLE
+syslog_forwarder_custom_rule: 'if ($msg contains "DEBUG") then stop'      # PaaS-TA Logging Agent에서 전송할 Custom Rule
+syslog_forwarder_fallback_servers: []
+portal_type: "vm"                     # PaaS-TA Portal 배포 타입(vm, app)
 
-# ELASTICSEARCH_MASTER
-es_master_azs: [z3]                                              # elasticsearch master : azs
-es_master_instances: 1                                           # elasticsearch master : instances (1) 
-es_master_persistent_disk_type: "10GB"                           # elasticsearch master : persistent disk type
-es_master_private_ips: "<ES_MASTER_PRIVATE_IPS>"                 # elasticsearch master : private ips (e.g. ["10.0.81.11"])
-es_master_private_url: "<ES_MASTER_PRIVATE_URL>"                 # elasticsearch master : private url (e.g. "10.0.81.11")
 
-# QUEUE
-queue_azs: [z3]                                                  # queue : azs
-queue_instances: 1                                               # queue : instances (1)
-queue_persistent_disk_type: "10GB"                               # queue : persistent disk type
-queue_private_ips: "<QUEUE_PRIVATE_IPS>"                         # queue : private ips (e.g. ["10.0.81.12"])
-queue_private_url: "<QUEUE_PRIVATE_URL>"                         # queue : private url (e.g. "10.0.81.12")
+# Fluentd
+fluentd_azs: ["z4"]                    # fluentd : azs
+fluentd_instances: 1                   # fluentd : instances (1)
+fluentd_vm_type: "small"               # fluentd : vm type
+fluentd_network: "default"             # fluentd 네트워크
+fluentd_ip: "<FLUENTD_IP>"
+fluentd_port: "3514"                   # fluentd Port
+fluentd_transport: "tcp"               # fluentd Logging Protocol
 
-# MAINTENANCE
-maintenance_azs: [z3]                                            # maintenance : azs
-maintenance_instances: 1                                         # maintenance : instances (1)
-maintenance_private_ips: "<MAINTENANCE_PRIVATE_IPS>"             # maintenance : private ips (e.g. ["10.0.81.13"])
 
-# ELASTICSEARCH_DATA
-es_data_azs: [z3]                                                # elasticsearch data : azs 
-es_data_instances: 2                                             # elasticsearch data : instances (N)
-es_data_persistent_disk_type: "20GB"                             # elasticsearch data : persistent disk type
-es_data_private_ips: "<ES_DATA_PRIVATE_IPS>"                     # elasticsearch data : private ips (e.g. ["10.0.81.14", "10.0.81.15"])
+# INFLUXDB
+influxdb_azs: ["z4"]			            # InfluxDB : azs
+influxdb_instances: 1			            # InfluxDB : instances (1)
+influxdb_vm_type: "large"		          # InfluxDB : vm type
+influxdb_network: "default"		        # InfluxDB 네트워크
+influxdb_persistent_disk_type: "10GB"	# InfluxDB 영구 Disk 종류
 
-# VISUALIZATION
-visualization_azs: [z3]                                          # visualization : azs
-visualization_instances: 1                                       # visualization : instances (1) 
-visualization_private_ips: "<VISUALIZATION_PRIVATE_IPS>"         # visualization : private ips (e.g. ["10.0.81.16"])
-visualization_version:  "5.3.0"                                  # visualization : version (5.3.0)
+influxdb_ip: "<INFLUXDB_IP>"
+influxdb_http_port: "8086"                  # default 8086
+influxdb_username: "<INFLUXDB_USERNAME>"	  # InfluxDB Admin 계정 Username
+influxdb_password: "<INFLUXDB_PASSWORD>"	  # InfluxDB Admin 계정 Password
+influxdb_interval: "7d"                     # InfluxDB Retention Policy (bootstrapper)
 
-# COLLECTOR
-collector_azs: [z3]                                              # collector : azs
-collector_instances: 1                                           # collector : instances (1)
-collector_private_ips: "<COLLECTOR_PRIVATE_IPS>"                 # collector : private ips (e.g. ["10.0.81.17"])
-
-# PARSER
-parser_azs: [z3]                                                 # parser : azs
-parser_instances: 2                                              # parser : instances (N)
-parser_private_ips: "<PARSER_PRIVATE_IPS>"                       # parser : private ips (e.g. ["10.0.81.18", "10.0.81.19"])
-parser_es_index: "%{[@metadata][index]}-%{+YYYY.MM.dd.HH}"       # parser : elasticsearch index
-parser_es_index_type: '%{[@metadata][type]}'                     # parser : elasticsearch index type
+influxdb_database: "<INFLUXDB_DATABASE>"          # InfluxDB Database명
+influxdb_measurement: "<INFLUXDB_MEASUREMENT>"    # InfluxDB Measurement명
+influxdb_time_precision: "s"    # hour(h), minutes(m), second(s), millisecond(ms), microsecond(u), nanosecond(ns)
+influxdb_query_limit: "<INFLUXDB_QUERY_LIMIT>"                  # InfluxDB query limit (default "50")
 
-# ROUTER
-router_azs: [z7]                                                 # router : azs 
-router_instances: 1                                              # router : instances (1)
-router_private_ips: "<ROUTER_PRIVATE_IPS>"                       # router : private ips (e.g. ["10.0.0.101"])
-router_public_ips: "<ROUTER_PUBLIC_IPS>"                         # router : public ips (e.g. "13.209.212.226")
-router_private_url: "<ROUTER_PRIVATE_URL>"                       # router : private url (e.g. "10.0.0.101")
 
-# UAAC
-uaa_client_laas_id: "laasclient"                                 # logging service uaa client id
-uaa_client_laas_secret: "clientsecret"                           # logging service uaa client secret
+# COLLECTOR
+collector_azs: ["z4"]           # collector : azs
+collector_instances: 1          # collector : instances (1)
+collector_vm_type: "small"      # collector : vm type
+collector_network: "default"    # collector 네트워크
 
-# LOGGING SERVICE
-es_config_index_prefix: "laas-"                                  # logging service elasticsearch index prefix ("laas-")
-retention_period: 7                                              # logging service retention period
-laas_logo: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALQAAABGCAYAAABll74gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3FpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpkYzhkNmI4YS1kZWNkLThkNGItOThiNC0zMjRjZjU1OTE0NmYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MkRBNUQ0REMyQ0EwMTFFOEI2QkZBQUY2QUYwM0UzRjkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MkRBNUQ0REIyQ0EwMTFFOEI2QkZBQUY2QUYwM0UzRjkiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjQ5YzFjOTUyLWE2MDEtZTI0NC1iMzIzLTMzYTIyNzI1NDcxYiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpkYzhkNmI4YS1kZWNkLThkNGItOThiNC0zMjRjZjU1OTE0NmYiLz4gPC9y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"
 
+# API
+api_azs: ["z4"]                                             # api : azs
+api_instances: 1                                            # api : instances (1)
+api_vm_type: "small"                                        # api : vm type
+api_network: "default"                                      # api 네트워크
\ No newline at end of file

From 1a9326fbf9c8f009b4e55dab3d4cf130b4f02f57 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Tue, 8 Nov 2022 16:55:23 +0900
Subject: [PATCH 02/10] Fix logging-service config

---
 logging-service/logging-service.yml            |  3 +++
 logging-service/operations/portal-app-type.yml | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index 7640fa3..f7a7568 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -156,6 +156,9 @@ instance_groups:
     consumes:
       paas-ta-portal-registration-link: {from: portal-registration, deployment: portal-api}
   properties:
+    spring:
+      application:
+        name: PortalLoggingApi
     influxdb:
       ip: ((influxdb_ip))
       port: ((influxdb_http_port))
diff --git a/logging-service/operations/portal-app-type.yml b/logging-service/operations/portal-app-type.yml
index a49b38b..0f57233 100644
--- a/logging-service/operations/portal-app-type.yml
+++ b/logging-service/operations/portal-app-type.yml
@@ -6,8 +6,10 @@
     paas-ta-portal-registration-link: nil
 
 - type: replace
-  path: /instance_groups/name=api/properties?
+  path: /instance_groups/name=api/properties/paasta?
   value:
-    paasta:
-      domain: ((system_domain))
-    portalType: app
\ No newline at end of file
+    domain: ((system_domain))
+
+- type: replace
+  path: /instance_groups/name=api/properties/portalType?
+  value: app
\ No newline at end of file

From 0537af055f412c433b1491678cc1fc3ed421f472 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Wed, 9 Nov 2022 13:57:05 +0900
Subject: [PATCH 03/10] Update release info

---
 logging-service/logging-service.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index f7a7568..a139597 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -8,7 +8,7 @@ stemcells:
 
 releases:
 - name: paasta-portal-api-release
-  sha1: e04ae6b2f796e78ebe3243d9f0325224a6979c99
+  sha1: a9b01f7a46cc86a284954ca6c9072fc4efd41954
   version: 2.5.10
   url: https://nextcloud.paas-ta.org/index.php/s/GiKm67pjZ3mRP2m/download
 - name: monitoring-dashboard-release

From 2ae810996bc31a28913daf2ec95d6b989b55182d Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Wed, 9 Nov 2022 14:22:59 +0900
Subject: [PATCH 04/10] Fix variable name

---
 logging-service/vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging-service/vars.yml b/logging-service/vars.yml
index a8b60c9..e4bcadf 100644
--- a/logging-service/vars.yml
+++ b/logging-service/vars.yml
@@ -6,7 +6,7 @@ stemcell_version: "1.107"		# Stemcell Version
 # VARIABLE
 syslog_forwarder_custom_rule: 'if ($msg contains "DEBUG") then stop'      # PaaS-TA Logging Agent에서 전송할 Custom Rule
 syslog_forwarder_fallback_servers: []
-portal_type: "vm"                     # PaaS-TA Portal 배포 타입(vm, app)
+portal_deploy_type: "vm"                     # PaaS-TA Portal 배포 타입(vm, app)
 
 
 # Fluentd

From c2711fcb8167cb3ac145067f74d354cd04c66749 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Thu, 10 Nov 2022 13:57:19 +0900
Subject: [PATCH 05/10] Rename api to log-api

---
 logging-service/logging-service.yml            | 10 +++++-----
 logging-service/operations/portal-app-type.yml |  6 +++---
 logging-service/vars.yml                       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index a139597..ca149ee 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -143,13 +143,13 @@ instance_groups:
         tls_enabled: false
         transport: ((fluentd_transport))
 
-- name : api
-  azs: ((api_azs))
-  instances: ((api_instances))
-  vm_type: ((api_vm_type))
+- name : log-api
+  azs: ((log_api_azs))
+  instances: ((log_api_instances))
+  vm_type: ((log_api_vm_type))
   stemcell: default
   networks:
-  - name: ((api_network))
+  - name: ((log_api_network))
   jobs:
   - name: paas-ta-portal-log-api
     release: paasta-portal-api-release
diff --git a/logging-service/operations/portal-app-type.yml b/logging-service/operations/portal-app-type.yml
index 0f57233..88f62d0 100644
--- a/logging-service/operations/portal-app-type.yml
+++ b/logging-service/operations/portal-app-type.yml
@@ -1,15 +1,15 @@
 ---
 
 - type: replace
-  path: /instance_groups/name=api/jobs/name=paas-ta-portal-log-api/consumes
+  path: /instance_groups/name=log-api/jobs/name=paas-ta-portal-log-api/consumes
   value:
     paas-ta-portal-registration-link: nil
 
 - type: replace
-  path: /instance_groups/name=api/properties/paasta?
+  path: /instance_groups/name=log-api/properties/paasta?
   value:
     domain: ((system_domain))
 
 - type: replace
-  path: /instance_groups/name=api/properties/portalType?
+  path: /instance_groups/name=log-api/properties/portalType?
   value: app
\ No newline at end of file
diff --git a/logging-service/vars.yml b/logging-service/vars.yml
index e4bcadf..50c5904 100644
--- a/logging-service/vars.yml
+++ b/logging-service/vars.yml
@@ -45,8 +45,8 @@ collector_vm_type: "small"      # collector : vm type
 collector_network: "default"    # collector 네트워크
 
 
-# API
-api_azs: ["z4"]                                             # api : azs
-api_instances: 1                                            # api : instances (1)
-api_vm_type: "small"                                        # api : vm type
-api_network: "default"                                      # api 네트워크
\ No newline at end of file
+# LOG-API
+log_api_azs: ["z4"]                                             # log-api : azs
+log_api_instances: 1                                            # log-api : instances (1)
+log_api_vm_type: "small"                                        # log-api : vm type
+log_api_network: "default"                                      # log-api 네트워크
\ No newline at end of file

From 7d6546d2b59038a6ed84945bad672d9c863d1c9e Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Thu, 10 Nov 2022 17:00:25 +0900
Subject: [PATCH 06/10] Update log-api properties

---
 logging-service/operations/portal-app-type.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/logging-service/operations/portal-app-type.yml b/logging-service/operations/portal-app-type.yml
index 88f62d0..682f277 100644
--- a/logging-service/operations/portal-app-type.yml
+++ b/logging-service/operations/portal-app-type.yml
@@ -6,9 +6,11 @@
     paas-ta-portal-registration-link: nil
 
 - type: replace
-  path: /instance_groups/name=log-api/properties/paasta?
+  path: /instance_groups/name=log-api/properties/eureka?
   value:
-    domain: ((system_domain))
+    client:
+      serviceUrl:
+        defaultZone: 'http://portal-registration.((system_domain))/eureka/'
 
 - type: replace
   path: /instance_groups/name=log-api/properties/portalType?

From 15c7c01f9db54681f17e87278542021aa2d3a850 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Fri, 11 Nov 2022 13:19:41 +0900
Subject: [PATCH 07/10] Update release info

---
 logging-service/logging-service.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index ca149ee..6c15bbf 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -8,7 +8,7 @@ stemcells:
 
 releases:
 - name: paasta-portal-api-release
-  sha1: a9b01f7a46cc86a284954ca6c9072fc4efd41954
+  sha1: 4333b908237e5db7dc252df2d4e90c229b3c39f1
   version: 2.5.10
   url: https://nextcloud.paas-ta.org/index.php/s/GiKm67pjZ3mRP2m/download
 - name: monitoring-dashboard-release

From 4e7b159086f9ab3a55886f3f257c4f7bffdbbfb6 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Thu, 24 Nov 2022 16:18:01 +0900
Subject: [PATCH 08/10] stemcell bionic 1.122

---
 gateway-service/vars.yml        | 2 +-
 glusterfs/vars.yml              | 2 +-
 lifecycle-service/vars.yml      | 2 +-
 logging-service/vars.yml        | 2 +-
 mongodb/vars.yml                | 2 +-
 mysql/vars.yml                  | 2 +-
 pinpoint/vars.yml               | 2 +-
 pipeline-service/vars.yml       | 2 +-
 rabbitmq/vars.yml               | 2 +-
 redis/vars.yml                  | 2 +-
 source-control-service/vars.yml | 2 +-
 web-ide/vars.yml                | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gateway-service/vars.yml b/gateway-service/vars.yml
index 0b367b0..08f61d8 100644
--- a/gateway-service/vars.yml
+++ b/gateway-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                         # stemcell os
-stemcell_version: "1.107"                                           # stemcell version
+stemcell_version: "1.122"                                           # stemcell version
 
 # VM_TYPE
 vm_type_default: "medium"                                            # vm type default
diff --git a/glusterfs/vars.yml b/glusterfs/vars.yml
index 0d900b4..f9a6dd0 100644
--- a/glusterfs/vars.yml
+++ b/glusterfs/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.107"                                       # stemcell version
+stemcell_version: "1.122"                                       # stemcell version
 
 
 # NETWORK
diff --git a/lifecycle-service/vars.yml b/lifecycle-service/vars.yml
index 3b4de74..c274ec9 100644
--- a/lifecycle-service/vars.yml
+++ b/lifecycle-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                                         # stemcell os
-stemcell_version: "1.107"                                                           # stemcell version
+stemcell_version: "1.122"                                                           # stemcell version
 
 # VM_TYPE
 vm_type_default: "medium"                                                            # vm type default
diff --git a/logging-service/vars.yml b/logging-service/vars.yml
index 50c5904..8355f21 100644
--- a/logging-service/vars.yml
+++ b/logging-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"		# Stemcell OS
-stemcell_version: "1.107"		# Stemcell Version
+stemcell_version: "1.122"		# Stemcell Version
 
 
 # VARIABLE
diff --git a/mongodb/vars.yml b/mongodb/vars.yml
index 8661bf5..be3bb9c 100644
--- a/mongodb/vars.yml
+++ b/mongodb/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.107"                                       # stemcell version
+stemcell_version: "1.122"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name
diff --git a/mysql/vars.yml b/mysql/vars.yml
index 33a97df..50322a2 100644
--- a/mysql/vars.yml
+++ b/mysql/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.107"                                       # stemcell version
+stemcell_version: "1.122"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name
diff --git a/pinpoint/vars.yml b/pinpoint/vars.yml
index 94fad95..fea304c 100644
--- a/pinpoint/vars.yml
+++ b/pinpoint/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.107"                                       # stemcell version
+stemcell_version: "1.122"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name
diff --git a/pipeline-service/vars.yml b/pipeline-service/vars.yml
index b6a86ff..f706be7 100644
--- a/pipeline-service/vars.yml
+++ b/pipeline-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.107"                                       # stemcell version
+stemcell_version: "1.122"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name
diff --git a/rabbitmq/vars.yml b/rabbitmq/vars.yml
index 35e67f0..fc66beb 100644
--- a/rabbitmq/vars.yml
+++ b/rabbitmq/vars.yml
@@ -2,7 +2,7 @@ deployment_name: "rabbitmq"                                  # rabbitmq deployme
 
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                # stemcell os
-stemcell_version: "1.107"                                  # stemcell version
+stemcell_version: "1.122"                                  # stemcell version
 
 # VM_TYPE
 vm_type_small: "minimal"                                    # vm type small 
diff --git a/redis/vars.yml b/redis/vars.yml
index 4b2e860..e87577f 100644
--- a/redis/vars.yml
+++ b/redis/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                      # Deployment Main Stemcell OS
-stemcell_version: "1.107"                                        # Main Stemcell Version
+stemcell_version: "1.122"                                        # Main Stemcell Version
 
 # NETWORK
 private_networks_name: "default"                                  # private network name
diff --git a/source-control-service/vars.yml b/source-control-service/vars.yml
index 310eca5..3a1ef5e 100644
--- a/source-control-service/vars.yml
+++ b/source-control-service/vars.yml
@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                   # stemcell os
-stemcell_version: "1.107"                                     # stemcell version
+stemcell_version: "1.122"                                     # stemcell version
 
 # VM_TYPE
 vm_type_small: "minimal"                                       # vm type small
diff --git a/web-ide/vars.yml b/web-ide/vars.yml
index c64afdc..90f1340 100644
--- a/web-ide/vars.yml
+++ b/web-ide/vars.yml
@@ -2,7 +2,7 @@ deployment_name: "web-ide"                                                # 서
 
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                              # stemcell os
-stemcell_version: "1.107"                                                  # stemcell version
+stemcell_version: "1.122"                                                  # stemcell version
 stemcell_alias: "default"                                                 # stemcell alias
 
 # NETWORK

From 029aaecf9a5a6f6523e69c98a8a127c7acf699b6 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Thu, 8 Dec 2022 17:20:18 +0900
Subject: [PATCH 09/10] Apply InfluxDB https connection

---
 logging-service/logging-service.yml | 10 +++++-----
 logging-service/vars.yml            |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index 6c15bbf..2f727f9 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -8,7 +8,7 @@ stemcells:
 
 releases:
 - name: paasta-portal-api-release
-  sha1: 4333b908237e5db7dc252df2d4e90c229b3c39f1
+  sha1: fc8cc89f95accf11de7aa8283444f2fc24a2acd7
   version: 2.5.10
   url: https://nextcloud.paas-ta.org/index.php/s/GiKm67pjZ3mRP2m/download
 - name: monitoring-dashboard-release
@@ -60,7 +60,7 @@ instance_groups:
         user: ((influxdb_username))
         password: ((influxdb_password))
         ssl:
-          enabled: false
+          enabled: ((influxdb_https_enabled))
       fluentd:
         port: ((fluentd_port))
         transport: ((fluentd_transport))
@@ -87,7 +87,7 @@ instance_groups:
         interval: ((influxdb_interval)) 
         replication: 1
         ips: 127.0.0.1
-        https_enabled: false
+        https_enabled: ((influxdb_https_enabled))
         http:
           bind-address: ((influxdb_http_port))
         pem_key: ((influxdb_ssl.certificate))((influxdb_ssl.private_key))
@@ -98,7 +98,7 @@ instance_groups:
       influxdb:
         user: ((influxdb_username))
         password: ((influxdb_password))
-        https_enabled: false
+        https_enabled: ((influxdb_https_enabled))
         http:
           bind-address: ((influxdb_http_port))
   - name: bpm
@@ -120,7 +120,7 @@ instance_groups:
         firehose_client_id: firehose-to-syslog
         firehose_client_secret: firehose-secret
         firehose_events: LogMessage
-        skip_ssl_validation: true
+        skip_ssl_validation: "true"
       create-uaa-client:
         cloudfoundry:
           system_domain: ((system_domain))
diff --git a/logging-service/vars.yml b/logging-service/vars.yml
index 8355f21..7726e98 100644
--- a/logging-service/vars.yml
+++ b/logging-service/vars.yml
@@ -31,6 +31,7 @@ influxdb_http_port: "8086"                  # default 8086
 influxdb_username: "<INFLUXDB_USERNAME>"	  # InfluxDB Admin 계정 Username
 influxdb_password: "<INFLUXDB_PASSWORD>"	  # InfluxDB Admin 계정 Password
 influxdb_interval: "7d"                     # InfluxDB Retention Policy (bootstrapper)
+influxdb_https_enabled: "true"              # InfluxDB HTTPS 설정
 
 influxdb_database: "<INFLUXDB_DATABASE>"          # InfluxDB Database명
 influxdb_measurement: "<INFLUXDB_MEASUREMENT>"    # InfluxDB Measurement명

From f4870f64cebc3e18220c328aae1b6f00c2d24d29 Mon Sep 17 00:00:00 2001
From: yu-jin-song <yujinsong.tech@gmail.com>
Date: Fri, 9 Dec 2022 17:21:40 +0900
Subject: [PATCH 10/10] Add influxDB https enabled property & Update release
 info

---
 logging-service/logging-service.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/logging-service/logging-service.yml b/logging-service/logging-service.yml
index 2f727f9..8a4acd5 100644
--- a/logging-service/logging-service.yml
+++ b/logging-service/logging-service.yml
@@ -8,7 +8,7 @@ stemcells:
 
 releases:
 - name: paasta-portal-api-release
-  sha1: fc8cc89f95accf11de7aa8283444f2fc24a2acd7
+  sha1: 3e5af30ce706d3fa07ef7f89cc4a38be83d0faf1
   version: 2.5.10
   url: https://nextcloud.paas-ta.org/index.php/s/GiKm67pjZ3mRP2m/download
 - name: monitoring-dashboard-release
@@ -167,6 +167,8 @@ instance_groups:
       database: ((influxdb_database))
       measurement: ((influxdb_measurement))
       limit: ((influxdb_query_limit))
+      https:
+        enabled: ((influxdb_https_enabled))
 
 
 variables: