Update version.json

dsk-metric-base-flat-stream
product: release-0.1.10

.gitignore

@@ -1 +1,2 @@
 __pycache__
+dashboard/version-management.log

README.md

@@ -1,34 +1,34 @@
 # DataSaker
-### dsk-23.03.13
+### dsk-23.03.16
 
 # Service Version
 |   Type   | Name                          |  Candidate Version  |  Release Version  |  Product Version  |
 |:--------:|:------------------------------|:-------------------:|:-----------------:|:-----------------:|
-|  front   | dsk-ui                        |   release-0.2.22    |  release-0.2.22   |  release-0.2.22   |
+|  front   | dsk-ui                        |   release-0.2.50    |  release-0.2.50   |  release-0.2.30   |
-|   api    | dsk-agent-api                 |   release-0.1.15    |  release-0.1.15   |  release-0.1.14   |
+|   api    | dsk-agent-api                 |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
 |   api    | dsk-agentmanager-api          |    release-0.1.6    |   release-0.1.6   |   release-0.1.6   |
-|   api    | dsk-alert-api                 |   release-0.1.17    |  release-0.1.17   |  release-0.1.17   |
+|   api    | dsk-alert-api                 |   release-0.1.20    |  release-0.1.20   |  release-0.1.19   |
 |   api    | dsk-apm-api                   |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
-|   api    | dsk-chart-api                 |    release-0.2.8    |   release-0.2.8   |   release-0.2.8   |
+|   api    | dsk-chart-api                 |                     |  release-0.2.12   |  release-0.2.11   |
 |   api    | dsk-dashboard-api             |   release-0.1.16    |  release-0.1.16   |  release-0.1.16   |
-|   api    | dsk-database-api              |   release-0.1.26    |  release-0.1.26   |  release-0.1.22   |
+|   api    | dsk-database-api              |   release-0.1.35    |  release-0.1.35   |  release-0.1.27   |
 |   api    | dsk-infrastructure-api        |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
-|   api    | dsk-log-api                   |   release-0.1.12    |  release-0.1.12   |  release-0.1.12   |
+|   api    | dsk-log-api                   |   release-0.1.13    |  release-0.1.13   |  release-0.1.12   |
-|   api    | dsk-notification-api          |    release-0.2.6    |   release-0.2.6   |   release-0.2.6   |
+|   api    | dsk-notification-api          |                     |   release-0.2.9   |   release-0.2.9   |
 |   api    | dsk-usergate-api              |   release-0.1.13    |  release-0.1.13   |  release-0.1.13   |
-|   api    | dsk-app-sender                |    release-0.2.1    |   release-0.2.1   |   release-0.2.0   |
+|   api    | dsk-app-sender                |    release-0.2.1    |   release-0.2.1   |   release-0.2.1   |
 |   api    | dsk-backoffice                |                     |                   |                   |
-|   api    | dsk-metering-batch            |                     |   release-0.0.3   |                   |
+|   api    | dsk-metering-batch            |    release-0.0.5    |   release-0.0.4   |                   |
 |   api    | dsk-metering-blocking-batch   |                     |                   |                   |
 |   api    | dsk-live-api                  |                     |                   |                   |
-|   api    | dsk-billing-api               |    release-0.1.2    |   release-0.1.2   |   release-0.1.2   |
+|   api    | dsk-billing-api               |    release-0.1.3    |   release-0.1.2   |   release-0.1.2   |
 |  stream  | dsk-database-plan-stream      |    release-0.1.1    |   release-0.1.1   |                   |
 |  stream  | dsk-metric-base-agg-stream    |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
-|  stream  | dsk-metric-base-flat-stream   |    release-0.1.6    |   release-0.1.6   |   release-0.1.6   |
+|  stream  | dsk-metric-base-flat-stream   |   release-0.1.10    |  release-0.1.10   |   release-0.1.6   |
-|  stream  | dsk-trace-stream              |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
+|  stream  | dsk-trace-stream              |    release-0.2.0    |   release-0.2.0   |   release-0.1.3   |
 |  stream  | dsk-metric-custom-flat-stream |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
-|  stream  | dsk-tagging-connector         |   release-0.1.10    |  release-0.1.10   |  release-0.1.10   |
+|  stream  | dsk-tagging-connector         |                     |  release-0.1.10   |  release-0.1.10   |
 |  stream  | dsk-kafka2storage             |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
 |  stream  | dsk-log-connector             |    release-0.1.3    |   release-0.1.3   |   release-0.1.3   |
-| datagate | dsk-datagate                  |    release-0.1.6    |   release-0.1.6   |   release-0.1.6   |
+| datagate | dsk-datagate                  |    release-0.1.7    |   release-0.1.7   |   release-0.1.6   |
 | datagate | dsk-loggate                   |    release-0.1.5    |   release-0.1.5   |   release-0.1.5   |

dashboard/logger.py

@@ -1,4 +1,4 @@
-import os, socket, logging
+import os, logging
 
 host = os.environ.get('VERSION_MANAGEMENT_SERVICE_HOST', default='10.10.43.240')
 service = os.environ.get('VERSION_MANAGEMENT_SERVICE_PORT', default=31090)
@@ -8,16 +8,11 @@ class PrintHandler(logging.Handler):
         msg = self.format(record)
         print(msg)
         
-def get_sock_name():
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    sock.connect((host, service))
-    return sock.getsockname()[0]
-
 def setup_logger():
     logger = logging.getLogger(__name__)
     logger.setLevel(logging.INFO)
     log_file='dashboard/version-management.log'
-    formatter = logging.Formatter(f'%(asctime)s %(levelname)s {get_sock_name()} : %(message)s')
+    formatter = logging.Formatter(f'%(asctime)s %(levelname)s : %(message)s')
 
     file_handler = logging.FileHandler(log_file)
     file_handler.setFormatter(formatter)

dashboard/settings.py

@@ -1,4 +1,4 @@
-import json, requests, os
+import os, json, requests, subprocess
 from git import Repo
 
 repo = Repo('.')
@@ -16,7 +16,8 @@ def get_commit_id():
     return repo.head.commit
 
 def get_tags():
-    return repo.tags
+    latest_tags = sorted(repo.tags, key=lambda t: t.commit.committed_date, reverse=True)
+    return latest_tags
 
 def get_github_releases():
     headers = {'Authorization': f'Bearer {github_token}', 'Accept': 'application/vnd.github.v3+json'}
@@ -27,16 +28,16 @@ def get_user_name_list():
     users = ['', 'dsk-minchulahn', 'Ose-Exem', 'deukjin', 'pparkssi3']
     return users
 
-def get_user_email(name):
+def get_user_email(username):
-    if name == 'dsk-minchulahn': return 'minchulahn@ex-em.com'
+    if username == 'dsk-minchulahn': return 'minchulahn@ex-em.com'
-    elif name == 'Ose-Exem': return 'ose@ex-em.com'
+    elif username == 'Ose-Exem': return 'ose@ex-em.com'
-    elif name == 'deukjin': return 'djkim@ex-em.com'
+    elif username == 'deukjin': return 'djkim@ex-em.com'
-    elif name == 'pparkssi3': return 'pparkssi@ex-em.com'
+    elif username == 'pparkssi3': return 'pparkssi@ex-em.com'
     else: return ''
     
-def set_git_config(name, email):
+def set_git_config(username, email):
-    repo.config_writer().set_value('user', 'name', name).release()
+    subprocess.run(["git", "config", "--global", "user.name", username], check=True)
-    repo.config_writer().set_value('user', 'email', email).release()
+    subprocess.run(["git", "config", "--global", "user.email", email], check=True)
 
 def diff():
     if len(repo.index.diff(repo.head.commit)) > 0:

dashboard/sidebar.py

@@ -36,7 +36,9 @@ def show_sidebar(df, edited_df):
         st.subheader('Git Push')
         with st.expander('Git Push'):
             selected_user_name = st.selectbox('User Name', get_user_name_list(), key='git_user_name')
-            set_git_config(selected_user_name, get_user_email(selected_user_name))
+            
+            if selected_user_name:
+                set_git_config(selected_user_name, get_user_email(selected_user_name))
             
             commit_message = st.text_input('Commit Message', value='Update version.json')
             extended_description = st.text_area('Extended description', value=set_extended_description(edited_df), height=200)

version.json

@@ -1,13 +1,13 @@
 {
-    "datasaker": "dsk-23.03.13",
+    "datasaker": "dsk-23.03.16",
     "service": [
         {
             "type": "front",
             "name": "dsk-ui",
-            "latest_candidate_version": "release-0.2.22",
+            "latest_candidate_version": "release-0.2.50",
-            "candidate_version": "release-0.2.22",
+            "candidate_version": "release-0.2.50",
-            "release_version": "release-0.2.22",
+            "release_version": "release-0.2.50",
-            "product_version": "release-0.2.22"
+            "product_version": "release-0.2.30"
         },
         {
             "type": "api",
@@ -28,10 +28,10 @@
         {
             "type": "api",
             "name": "dsk-alert-api",
-            "latest_candidate_version": "release-0.1.17",
+            "latest_candidate_version": "release-0.1.20",
-            "candidate_version": "release-0.1.17",
+            "candidate_version": "release-0.1.20",
-            "release_version": "release-0.1.17",
+            "release_version": "release-0.1.20",
-            "product_version": "release-0.1.17"
+            "product_version": "release-0.1.19"
         },
         {
             "type": "api",
@@ -44,10 +44,10 @@
         {
             "type": "api",
             "name": "dsk-chart-api",
-            "latest_candidate_version": "release-0.2.8",
+            "latest_candidate_version": "release-0.2.12",
-            "candidate_version": "release-0.2.8",
+            "candidate_version": "",
-            "release_version": "release-0.2.8",
+            "release_version": "release-0.2.12",
-            "product_version": "release-0.2.8"
+            "product_version": "release-0.2.11"
         },
         {
             "type": "api",
@@ -60,10 +60,10 @@
         {
             "type": "api",
             "name": "dsk-database-api",
-            "latest_candidate_version": "release-0.1.26",
+            "latest_candidate_version": "release-0.1.35",
-            "candidate_version": "release-0.1.26",
+            "candidate_version": "release-0.1.35",
-            "release_version": "release-0.1.26",
+            "release_version": "release-0.1.35",
-            "product_version": "release-0.1.26"
+            "product_version": "release-0.1.27"
         },
         {
             "type": "api",
@@ -76,18 +76,18 @@
         {
             "type": "api",
             "name": "dsk-log-api",
-            "latest_candidate_version": "release-0.1.12",
+            "latest_candidate_version": "release-0.1.13",
-            "candidate_version": "release-0.1.12",
+            "candidate_version": "release-0.1.13",
-            "release_version": "release-0.1.12",
+            "release_version": "release-0.1.13",
             "product_version": "release-0.1.12"
         },
         {
             "type": "api",
             "name": "dsk-notification-api",
-            "latest_candidate_version": "release-0.2.6",
+            "latest_candidate_version": "release-0.2.9",
-            "candidate_version": "release-0.2.6",
+            "candidate_version": "",
-            "release_version": "release-0.2.6",
+            "release_version": "release-0.2.9",
-            "product_version": "release-0.2.6"
+            "product_version": "release-0.2.9"
         },
         {
             "type": "api",
@@ -103,7 +103,7 @@
             "latest_candidate_version": "release-0.2.1",
             "candidate_version": "release-0.2.1",
             "release_version": "release-0.2.1",
-            "product_version": "release-0.2.0"
+            "product_version": "release-0.2.1"
         },
         {
             "type": "api",
@@ -116,9 +116,9 @@
         {
             "type": "api",
             "name": "dsk-metering-batch",
-            "latest_candidate_version": "release-0.0.3",
+            "latest_candidate_version": "release-0.0.5",
-            "candidate_version": "",
+            "candidate_version": "release-0.0.5",
-            "release_version": "release-0.0.3",
+            "release_version": "release-0.0.4",
             "product_version": ""
         },
         {
@@ -140,8 +140,8 @@
         {
             "type": "api",
             "name": "dsk-billing-api",
-            "latest_candidate_version": "release-0.1.2",
+            "latest_candidate_version": "release-0.1.3",
-            "candidate_version": "release-0.1.2",
+            "candidate_version": "release-0.1.3",
             "release_version": "release-0.1.2",
             "product_version": "release-0.1.2"
         },
@@ -164,17 +164,17 @@
         {
             "type": "stream",
             "name": "dsk-metric-base-flat-stream",
-            "latest_candidate_version": "release-0.1.6",
+            "latest_candidate_version": "release-0.1.10",
-            "candidate_version": "release-0.1.6",
+            "candidate_version": "release-0.1.10",
-            "release_version": "release-0.1.6",
+            "release_version": "release-0.1.10",
-            "product_version": "release-0.1.6"
+            "product_version": "release-0.1.10"
         },
         {
             "type": "stream",
             "name": "dsk-trace-stream",
-            "latest_candidate_version": "release-0.1.3",
+            "latest_candidate_version": "release-0.2.0",
-            "candidate_version": "release-0.1.3",
+            "candidate_version": "release-0.2.0",
-            "release_version": "release-0.1.3",
+            "release_version": "release-0.2.0",
             "product_version": "release-0.1.3"
         },
         {
@@ -188,8 +188,8 @@
         {
             "type": "stream",
             "name": "dsk-tagging-connector",
-            "latest_candidate_version": "release-0.1.10",
+            "latest_candidate_version": "release-0.1.11",
-            "candidate_version": "release-0.1.10",
+            "candidate_version": "",
             "release_version": "release-0.1.10",
             "product_version": "release-0.1.10"
         },
@@ -212,9 +212,9 @@
         {
             "type": "datagate",
             "name": "dsk-datagate",
-            "latest_candidate_version": "release-0.1.6",
+            "latest_candidate_version": "release-0.1.7",
-            "candidate_version": "release-0.1.6",
+            "candidate_version": "release-0.1.7",
-            "release_version": "release-0.1.6",
+            "release_version": "release-0.1.7",
             "product_version": "release-0.1.6"
         },
         {