Update version.json

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

dsk-tagging-connector
product: release-0.1.13

README.md

@@ -1,19 +1,19 @@
 # DataSaker
-### dsk-23.04.2
+### dsk-23.04.3
 
 # Service Version
 |   Type   | Name                          |  Candidate Version  |  Release Version  |  Product Version  |
 |:--------:|:------------------------------|:-------------------:|:-----------------:|:-----------------:|
-|  front   | dsk-ui                        |    release-0.3.0    |  release-0.2.72   |  release-0.2.72   |
+|  front   | dsk-ui                        |    release-0.3.1    |   release-0.3.1   |  release-0.2.72   |
 |   api    | dsk-agent-api                 |   release-0.1.16    |  release-0.1.16   |  release-0.1.16   |
-|   api    | dsk-agentmanager-api          |    release-0.1.7    |   release-0.1.7   |   release-0.1.7   |
+|   api    | dsk-agentmanager-api          |   release-0.1.10    |   release-0.1.7   |   release-0.1.7   |
 |   api    | dsk-alert-api                 |   release-0.1.22    |  release-0.1.22   |  release-0.1.22   |
-|   api    | dsk-apm-api                   |   release-0.1.17    |  release-0.1.17   |  release-0.1.17   |
+|   api    | dsk-apm-api                   |   release-0.1.18    |  release-0.1.18   |  release-0.1.17   |
-|   api    | dsk-chart-api                 |   release-0.2.24    |  release-0.2.24   |  release-0.2.23   |
+|   api    | dsk-chart-api                 |   release-0.2.25    |  release-0.2.25   |  release-0.2.23   |
 |   api    | dsk-dashboard-api             |   release-0.1.19    |  release-0.1.19   |  release-0.1.18   |
 |   api    | dsk-database-api              |   release-0.1.44    |  release-0.1.44   |  release-0.1.44   |
-|   api    | dsk-infrastructure-api        |   release-0.1.17    |  release-0.1.16   |  release-0.1.16   |
+|   api    | dsk-infrastructure-api        |   release-0.1.18    |  release-0.1.18   |  release-0.1.16   |
-|   api    | dsk-log-api                   |   release-0.1.15    |  release-0.1.15   |  release-0.1.14   |
+|   api    | dsk-log-api                   |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
 |   api    | dsk-notification-api          |   release-0.2.13    |  release-0.2.13   |  release-0.2.13   |
 |   api    | dsk-usergate-api              |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
 |   api    | dsk-app-sender                |    release-0.2.2    |   release-0.2.2   |   release-0.2.2   |
@@ -21,11 +21,11 @@
 |   api    | dsk-metering-batch            |    release-0.0.9    |   release-0.0.9   |   release-0.0.9   |
 |   api    | dsk-metering-blocking-batch   |                     |                   |                   |
 |   api    | dsk-live-api                  |                     |                   |                   |
-|   api    | dsk-billing-api               |    release-0.1.7    |   release-0.1.7   |   release-0.1.7   |
+|   api    | dsk-billing-api               |    release-0.1.8    |   release-0.1.8   |   release-0.1.7   |
-|   api    | dsk-sla-api                   |    release-0.0.2    |   release-0.0.2   |   release-0.0.2   |
+|   api    | dsk-sla-api                   |    release-0.0.3    |   release-0.0.2   |   release-0.0.2   |
 |  stream  | dsk-database-plan-stream      |    release-0.1.2    |   release-0.1.2   |   release-0.1.2   |
 |  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.11    |  release-0.1.11   |  release-0.1.11   |
+|  stream  | dsk-metric-base-flat-stream   |   release-0.1.12    |  release-0.1.12   |  release-0.1.11   |
 |  stream  | dsk-trace-stream              |    release-0.2.1    |   release-0.2.1   |   release-0.2.1   |
 |  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.12   |

dashboard/main.py

@@ -1,6 +1,5 @@
 import pandas as pd
 import streamlit as st
-from datetime import datetime
 from streamlit_js_eval import streamlit_js_eval
 from settings import *
 from sidebar import show_sidebar
@@ -15,7 +14,7 @@ if __name__=='__main__':
         layout='wide'
     )
     
-    tab1, tab2 = st.tabs(["DataSaker", "Releases"])
+    tab1, tab2, tab3 = st.tabs(["DataSaker", "Releases", "Recent Deliveries"])
     
     with tab1:
         st.header('DataSaker')
@@ -48,13 +47,24 @@ if __name__=='__main__':
             st.write(st.session_state['data_editor']['edited_rows'])
         
     with tab2:
-        releases = get_github_releases()
+        releases = get_releases()
         for release in releases:
             st.write(f"### {release['name']}")
             st.write(release['html_url'])
-            st.write(datetime.strptime(release['published_at'], "%Y-%m-%dT%H:%M:%SZ"))
+            st.write(convert_utc_to_korea_time(release['published_at']))
-            # st.write(datetime.strptime(release['published_at'], "%Y-%m-%dT%H:%M:%SZ").strftime('%Y-%m-%d %H:%M:%S'))
             st.write(release['body'].replace('#', ''))
             st.divider()
             
+    with tab3:
+        deliveries = get_delivery()
+        
+        for delivery in deliveries:
+            st.write(f"#### {delivery['guid']}")
+            st.write(f"{convert_utc_to_korea_time(delivery['delivered_at'])}")
+            st.write(f"Event: {delivery['event']}")
+            st.write(f"Action: {delivery['action']}")
+            st.write(f"Delivery ID: {delivery['id']}")
+            
+            st.divider()
+            
     show_sidebar(df, edited_df)

dashboard/settings.py

@@ -1,10 +1,13 @@
 import os, json, requests, subprocess
+from datetime import datetime, timedelta
 from git import Repo
 
 repo = Repo('.')
 file_path = './version.json'
-api_url = 'https://api.github.com/repos/cloudmoa/dsk-version-management/releases'
+release_url = 'https://api.github.com/repos/cloudmoa/dsk-version-management/releases'
+delivery_url = 'https://api.github.com/repos/CloudMOA/dsk-version-management/hooks/412710389/deliveries'
 github_token = os.environ.get('GITHUB_TOKEN')
+headers = {'Authorization': f"Bearer {github_token}", 'Accept': 'application/vnd.github.v3+json'}
 
 def get_datasaker():
     return json.load(open(file_path, 'r'))['datasaker']
@@ -19,11 +22,13 @@ def get_tags():
     latest_tags = sorted(repo.tags, key=lambda t: t.commit.committed_date, reverse=True)
     return latest_tags
 
-def get_github_releases():
+def get_releases():
-    headers = {'Authorization': f'Bearer {github_token}', 'Accept': 'application/vnd.github.v3+json'}
+    releases = requests.get(release_url, headers=headers).json()
-    releases = requests.get(api_url, headers=headers).json()
     return releases
 
+def get_delivery():
+    return requests.get(delivery_url, headers=headers).json()
+
 def get_user_name_list():
     users = ['', 'dsk-minchulahn', 'Ose-Exem', 'deukjin', 'pparkssi3']
     return users
@@ -61,16 +66,24 @@ def git_push(commit_message, extended_description):
     repo.git.add('version.json')
     
     if len(repo.index.diff(repo.head.commit)) > 0:
-        repo.index.commit(f'{commit_message}\n\n{extended_description}')
+        repo.index.commit(f"{commit_message}\n\n{extended_description}")
         repo.git.push(force=False)
 
 def publish_release(selected_tag, release_title, release_describe):
-    headers = {'Authorization': f'Bearer {github_token}', 'Accept': 'application/vnd.github.v3+json'}
+    publish_release_data = {
-    release_data = {
         'tag_name': selected_tag,
         'name': release_title,
         'body': release_describe,
         'draft': False,
         'prerelease': False
     }
-    return requests.post(api_url, json=release_data, headers=headers)
+    return requests.post(release_url, json=publish_release_data, headers=headers)
+
+def redeliver(delivery_id):
+    redeliver_url = f"{delivery_url}/{delivery_id}/attempts"
+    return requests.post(redeliver_url, headers=headers)
+
+def convert_utc_to_korea_time(utc_time_str):
+    utc_time = datetime.fromisoformat(utc_time_str[:-1])    
+    korea_time = utc_time + timedelta(hours=9)
+    return korea_time.strftime("%Y-%m-%d %H:%M:%S")

dashboard/sidebar.py

@@ -49,21 +49,22 @@ def show_sidebar(df, edited_df):
                 st.session_state.push_button_disabled = True
 
             if st.button(key='push', label='Commit changes', disabled=st.session_state.push_button_disabled):
-                if selected_user_name and commit_message:
+                with st.spinner('RUNNING...'):
-                    if diff_remote_head():
+                    if selected_user_name and commit_message:                    
-                        if df.equals(edited_df):
+                        if diff_remote_head():
-                            logger.warning(f'Git Push - No changes have been made | {selected_user_name}')
+                            if df.equals(edited_df):                                    
-                            st.warning('No changes have been made', icon='⚠️')
+                                    logger.warning(f'Git Push - No changes have been made | {selected_user_name}')
+                                    st.warning('No changes have been made', icon='⚠️')
+                            else:
+                                set_version_json(edited_df)
+                                git_push(commit_message, extended_description)
+                                logger.info(f'Git Push - Success | {selected_user_name}')
+                                st.success('Success', icon='✅')
+                                time.sleep(1)
+                                streamlit_js_eval(js_expressions='parent.window.location.reload()')
                         else:
-                            set_version_json(edited_df)
+                            logger.error(f'Git Push - Updates were rejected because the tip of your current branch is behind | {selected_user_name}')
-                            git_push(commit_message, extended_description)
+                            st.error('Updates were rejected because the tip of your current branch is behind', icon='🚨')
-                            logger.info(f'Git Push - Success | {selected_user_name}')
-                            st.success('Success', icon='✅')
-                            time.sleep(1)
-                            streamlit_js_eval(js_expressions='parent.window.location.reload()')
-                    else:
-                        logger.error(f'Git Push - Updates were rejected because the tip of your current branch is behind | {selected_user_name}')
-                        st.error('Updates were rejected because the tip of your current branch is behind', icon='🚨')
         
         st.divider()
         
@@ -90,16 +91,36 @@ def show_sidebar(df, edited_df):
             
             if st.button(key='release', label='Publish release', disabled=st.session_state.release_button_disabled):
                 if selected_tag and release_title and release_describe:
-                    response = publish_release(selected_tag, release_title, release_describe)
+                    with st.spinner('RUNNING...'):
+                        publish_release_response = publish_release(selected_tag, release_title, release_describe)
                         
-                    if response.status_code == 201:
+                        if publish_release_response.status_code == 201:
-                        logger.info(f'Publish Release - Release created successfully')
+                            logger.info(f'Publish Release - Release created successfully')
-                        st.success('Release created successfully', icon='✅')
+                            st.success('Release created successfully', icon='✅')
-                        git_pull()
+                            git_pull()
-                        streamlit_js_eval(js_expressions='parent.window.location.reload()')
+                            streamlit_js_eval(js_expressions='parent.window.location.reload()')
-                    else:
+                        else:
-                        logger.error(f'Publish Release - Failed to create release. Status code: {response.status_code}')
+                            logger.error(f'Publish Release - Failed to create release. Status code: {publish_release_response.status_code}')
-                        logger.error(f'Response: {response.text}')
+                            logger.error(f'Response: {publish_release_response.text}')
-                        st.error(f'Failed to create release. Status code: {response.status_code}\n\n Response: {response.text}', icon='🚨')
+                            st.error(f'Failed to create release. Status code: {publish_release_response.status_code}\n\n Response: {publish_release_response.text}', icon='🚨')
         
         st.divider()
+        
+        st.subheader('Redeliver')
+        with st.expander('Redeliver'):
+            delivery_id = st.text_input('Delivery ID', value='')
+            
+            if st.button(key='redeliver', label='Redeliver'):
+                with st.spinner('RUNNING...'):
+                    redeliver_response = redeliver(delivery_id)
+                    time.sleep(2)
+                    
+                    if redeliver_response.status_code == 202:
+                        logger.info(f'Re Deliver - Success')
+                        st.success('successfully', icon='✅')
+                        streamlit_js_eval(js_expressions='parent.window.location.reload()')
+                    else:
+                        logger.error(f'ReDeliver - Failed to redeliver. Status code: {redeliver_response.status_code}')
+                        logger.error(f'Response: {redeliver_response.text}')
+                        st.error(f'Failed to redeliver. Status code: {redeliver_response.status_code}\n\n Response: {redeliver_response.text}', icon='🚨')
+                        

version.json

@@ -1,12 +1,12 @@
 {
-    "datasaker": "dsk-23.04.2",
+    "datasaker": "dsk-23.04.3",
     "service": [
         {
             "type": "front",
             "name": "dsk-ui",
-            "latest_candidate_version": "release-0.3.0",
+            "latest_candidate_version": "release-0.3.1",
-            "candidate_version": "release-0.3.0",
+            "candidate_version": "release-0.3.1",
-            "release_version": "release-0.2.72",
+            "release_version": "release-0.3.1",
             "product_version": "release-0.2.72"
         },
         {
@@ -20,8 +20,8 @@
         {
             "type": "api",
             "name": "dsk-agentmanager-api",
-            "latest_candidate_version": "release-0.1.7",
+            "latest_candidate_version": "release-0.1.10",
-            "candidate_version": "release-0.1.7",
+            "candidate_version": "release-0.1.10",
             "release_version": "release-0.1.7",
             "product_version": "release-0.1.7"
         },
@@ -37,16 +37,16 @@
             "type": "api",
             "name": "dsk-apm-api",
             "latest_candidate_version": "release-0.1.18",
-            "candidate_version": "release-0.1.17",
+            "candidate_version": "release-0.1.18",
-            "release_version": "release-0.1.17",
+            "release_version": "release-0.1.18",
             "product_version": "release-0.1.17"
         },
         {
             "type": "api",
             "name": "dsk-chart-api",
-            "latest_candidate_version": "release-0.2.24",
+            "latest_candidate_version": "release-0.2.25",
-            "candidate_version": "release-0.2.24",
+            "candidate_version": "release-0.2.25",
-            "release_version": "release-0.2.24",
+            "release_version": "release-0.2.25",
             "product_version": "release-0.2.23"
         },
         {
@@ -68,9 +68,9 @@
         {
             "type": "api",
             "name": "dsk-infrastructure-api",
-            "latest_candidate_version": "release-0.1.17",
+            "latest_candidate_version": "release-0.1.18",
-            "candidate_version": "release-0.1.17",
+            "candidate_version": "release-0.1.18",
-            "release_version": "release-0.1.16",
+            "release_version": "release-0.1.18",
             "product_version": "release-0.1.16"
         },
         {
@@ -140,16 +140,16 @@
         {
             "type": "api",
             "name": "dsk-billing-api",
-            "latest_candidate_version": "release-0.1.7",
+            "latest_candidate_version": "release-0.1.8",
-            "candidate_version": "release-0.1.7",
+            "candidate_version": "release-0.1.8",
-            "release_version": "release-0.1.7",
+            "release_version": "release-0.1.8",
             "product_version": "release-0.1.7"
         },
         {
             "type": "api",
             "name": "dsk-sla-api",
-            "latest_candidate_version": "release-0.0.2",
+            "latest_candidate_version": "release-0.0.3",
-            "candidate_version": "release-0.0.2",
+            "candidate_version": "release-0.0.3",
             "release_version": "release-0.0.2",
             "product_version": "release-0.0.2"
         },
@@ -172,10 +172,10 @@
         {
             "type": "stream",
             "name": "dsk-metric-base-flat-stream",
-            "latest_candidate_version": "release-0.1.11",
+            "latest_candidate_version": "release-0.1.12",
-            "candidate_version": "release-0.1.11",
+            "candidate_version": "release-0.1.12",
-            "release_version": "release-0.1.11",
+            "release_version": "release-0.1.12",
-            "product_version": "release-0.1.11"
+            "product_version": "release-0.1.12"
         },
         {
             "type": "stream",
@@ -199,7 +199,7 @@
             "latest_candidate_version": "release-0.1.13",
             "candidate_version": "",
             "release_version": "",
-            "product_version": "release-0.1.12"
+            "product_version": "release-0.1.13"
         },
         {
             "type": "stream",