Update version.json

dsk-agent-api
product: release-0.1.15

dsk-database-api
product: release-0.1.26

.gitignore

@@ -0,0 +1 @@
+__pycache__

Dockerfile

@@ -1,4 +0,0 @@
-FROM python:3.11-slim
-WORKDIR app
-COPY ./requirements.txt ./
-RUN pip install --upgrade pip && pip install -r requirements.txt

Dockerfile.cicd

@@ -0,0 +1,4 @@
+FROM python:3.11-slim
+WORKDIR app
+COPY requirements-cicd.txt requirements-cicd.txt
+RUN pip install --upgrade pip && pip install -r requirements-cicd.txt

Dockerfile.dashboard

@@ -0,0 +1,17 @@
+From python:3.11-slim
+
+WORKDIR app
+
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends curl vim git openssh-client \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY requirements-dashboard.txt requirements-dashboard.txt
+RUN pip install --no-cache-dir --upgrade pip && pip install -r requirements-dashboard.txt
+
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONIOENCODING=UTF-8
+
+COPY . .
+
+ENTRYPOINT ["streamlit", "run", "dashboard/main.py"]

README.md

@@ -1,34 +1,34 @@
 # DataSaker
-### dsk-23.03.8
+### dsk-23.03.13
 
 # Service Version
 |   Type   | Name                          |  Candidate Version  |  Release Version  |  Product Version  |
 |:--------:|:------------------------------|:-------------------:|:-----------------:|:-----------------:|
-|  front   | dsk-ui                        |   release-0.2.10    |  release-0.2.10   |  release-0.2.10   |
-|   api    | dsk-agent-api                 |   release-0.1.13    |  release-0.1.13   |  release-0.1.13   |
+|  front   | dsk-ui                        |   release-0.2.22    |  release-0.2.22   |  release-0.2.22   |
+|   api    | dsk-agent-api                 |   release-0.1.15    |  release-0.1.15   |  release-0.1.14   |
 |   api    | dsk-agentmanager-api          |    release-0.1.6    |   release-0.1.6   |   release-0.1.6   |
-|   api    | dsk-alert-api                 |   release-0.1.15    |  release-0.1.15   |  release-0.1.15   |
-|   api    | dsk-apm-api                   |   release-0.1.14    |  release-0.1.14   |  release-0.1.14   |
-|   api    | dsk-chart-api                 |    release-0.2.5    |   release-0.2.5   |   release-0.2.5   |
+|   api    | dsk-alert-api                 |   release-0.1.17    |  release-0.1.17   |  release-0.1.17   |
+|   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-dashboard-api             |   release-0.1.16    |  release-0.1.16   |  release-0.1.16   |
-|   api    | dsk-database-api              |   release-0.1.14    |  release-0.1.14   |  release-0.1.14   |
-|   api    | dsk-infrastructure-api        |   release-0.1.14    |  release-0.1.14   |  release-0.1.14   |
-|   api    | dsk-log-api                   |   release-0.1.11    |  release-0.1.11   |  release-0.1.11   |
-|   api    | dsk-notification-api          |    release-0.2.5    |   release-0.2.5   |   release-0.2.5   |
+|   api    | dsk-database-api              |   release-0.1.26    |  release-0.1.26   |  release-0.1.22   |
+|   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-notification-api          |    release-0.2.6    |   release-0.2.6   |   release-0.2.6   |
 |   api    | dsk-usergate-api              |   release-0.1.13    |  release-0.1.13   |  release-0.1.13   |
-|   api    | dsk-app-sender                |    release-0.2.0    |   release-0.2.0   |   release-0.2.0   |
+|   api    | dsk-app-sender                |    release-0.2.1    |   release-0.2.1   |   release-0.2.0   |
 |   api    | dsk-backoffice                |                     |                   |                   |
 |   api    | dsk-metering-batch            |                     |   release-0.0.3   |                   |
 |   api    | dsk-metering-blocking-batch   |                     |                   |                   |
 |   api    | dsk-live-api                  |                     |                   |                   |
-|   api    | dsk-billing-api               |    release-0.1.1    |                   |   release-0.1.1   |
+|   api    | dsk-billing-api               |    release-0.1.2    |   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-trace-stream              |    release-0.1.3    |   release-0.1.3   |   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.9    |   release-0.1.9   |   release-0.1.9   |
-|  stream  | dsk-kafka2storage             |    release-0.1.3    |   release-0.1.3   |   release-0.1.2   |
+|  stream  | dsk-tagging-connector         |   release-0.1.10    |  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.4   |
-| datagate | dsk-loggate                   |    release-0.1.4    |   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-loggate                   |    release-0.1.5    |   release-0.1.5   |   release-0.1.5   |

dashboard/logger.py

@@ -0,0 +1,33 @@
+import os, socket, logging
+
+host = os.environ.get('VERSION_MANAGEMENT_SERVICE_HOST', default='10.10.43.240')
+service = os.environ.get('VERSION_MANAGEMENT_SERVICE_PORT', default=31090)
+
+class PrintHandler(logging.Handler):
+    def emit(self, record):
+        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')
+
+    file_handler = logging.FileHandler(log_file)
+    file_handler.setFormatter(formatter)
+
+    print_handler = PrintHandler()
+    print_handler.setFormatter(formatter)
+
+    logger.addHandler(file_handler)
+    logger.addHandler(print_handler)
+
+    return logger
+
+logger = setup_logger()

dashboard/main.py

@@ -0,0 +1,60 @@
+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
+
+def highlight_disabled_col(value):
+    return 'background-color: #F0F2F6'
+
+if __name__=='__main__':
+    
+    st.set_page_config(
+        page_title='DataSaker Version Management',
+        layout='wide'
+    )
+    
+    tab1, tab2 = st.tabs(["DataSaker", "Releases"])
+    
+    with tab1:
+        st.header('DataSaker')
+        st.write(f"##### {get_datasaker()}")
+            
+        col1, col2 = st.columns([7, 3])
+        with col1:
+            st.subheader('Service')
+            if st.button('Data Reload'):
+                git_pull()
+                streamlit_js_eval(js_expressions='parent.window.location.reload()')
+            
+            df = pd.DataFrame.from_dict(get_service())
+            regex = '^release-[0-9]+.[0-9]+.[0-9]+$'
+            edited_df = st.data_editor(
+                df.style.applymap(highlight_disabled_col), 
+                key='data_editor',
+                column_config={
+                    'type': st.column_config.TextColumn('Type', disabled=True),
+                    'name': st.column_config.TextColumn('Name', disabled=True, width='medium'),
+                    'latest_candidate_version': st.column_config.TextColumn('Candidate Latest Version', disabled=True),
+                    'candidate_version': st.column_config.TextColumn('Candidate Version', validate=regex),
+                    'release_version': st.column_config.TextColumn('Release Version', validate=regex),
+                    'product_version': st.column_config.TextColumn('Product Version', validate=regex)
+                },
+                height=800
+            )
+        with col2:
+            st.text('Edited Rows')
+            st.write(st.session_state['data_editor']['edited_rows'])
+        
+    with tab2:
+        releases = get_github_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(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()
+            
+    show_sidebar(df, edited_df)

dashboard/settings.py

@@ -0,0 +1,75 @@
+import json, requests, os
+from git import Repo
+
+repo = Repo('.')
+file_path = './version.json'
+api_url = 'https://api.github.com/repos/cloudmoa/dsk-version-management/releases'
+github_token = os.environ.get('GITHUB_TOKEN')
+
+def get_datasaker():
+    return json.load(open(file_path, 'r'))['datasaker']
+
+def get_service():
+    return json.load(open(file_path, 'r'))['service']
+
+def get_commit_id():
+    return repo.head.commit
+
+def get_tags():
+    return repo.tags
+
+def get_github_releases():
+    headers = {'Authorization': f'Bearer {github_token}', 'Accept': 'application/vnd.github.v3+json'}
+    releases = requests.get(api_url, headers=headers).json()
+    return releases
+
+def get_user_name_list():
+    users = ['', 'dsk-minchulahn', 'Ose-Exem', 'deukjin', 'pparkssi3']
+    return users
+
+def get_user_email(name):
+    if name == 'dsk-minchulahn': return 'minchulahn@ex-em.com'
+    elif name == 'Ose-Exem': return 'ose@ex-em.com'
+    elif name == 'deukjin': return 'djkim@ex-em.com'
+    elif name == 'pparkssi3': return 'pparkssi@ex-em.com'
+    else: return ''
+    
+def set_git_config(name, email):
+    repo.config_writer().set_value('user', 'name', name).release()
+    repo.config_writer().set_value('user', 'email', email).release()
+
+def diff():
+    if len(repo.index.diff(repo.head.commit)) > 0:
+        return True
+    return False
+
+def diff_remote_head():
+    repo.remote().fetch()
+    remote_head = repo.remote().refs['main'].commit
+    
+    if repo.head.commit == remote_head:
+        return True
+    else:
+        return False
+
+def git_pull():
+    repo.remote().fetch()
+    repo.remotes.origin.pull()
+
+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.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'}
+    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)

dashboard/sidebar.py

@@ -0,0 +1,103 @@
+import json, time
+import streamlit as st
+from streamlit_js_eval import streamlit_js_eval
+from settings import *
+from logger import logger
+
+if 'push_button_disabled' not in st.session_state:
+    st.session_state.push_button_disabled = True
+if 'release_button_disabled' not in st.session_state:
+    st.session_state.release_button_disabled = True
+
+def set_extended_description(edited_df):
+    json_edited_df = json.loads(edited_df.to_json(orient='records'))
+    extended_description_value = []
+    for idx, changed_idx in enumerate(st.session_state['data_editor']['edited_rows']):
+        if idx == 0: 
+            extended_description_value.append(json_edited_df[changed_idx]['name'])
+        else: 
+            extended_description_value.append('\n' + json_edited_df[changed_idx]['name'])
+        
+        if 'candidate_version' in st.session_state['data_editor']['edited_rows'][changed_idx]:
+            extended_description_value.append(f"candidate: {st.session_state['data_editor']['edited_rows'][changed_idx]['candidate_version']}")
+        if 'release_version' in st.session_state['data_editor']['edited_rows'][changed_idx]:
+            extended_description_value.append(f"release: {st.session_state['data_editor']['edited_rows'][changed_idx]['release_version']}")
+        if 'product_version' in st.session_state['data_editor']['edited_rows'][changed_idx]:
+            extended_description_value.append(f"product: {st.session_state['data_editor']['edited_rows'][changed_idx]['product_version']}")
+    return '\n'.join(extended_description_value)
+
+def set_version_json(edited_df):
+    data = {'datasaker': get_datasaker(),'service': json.loads(edited_df.to_json(orient='records'))}
+    with open('version.json', 'w') as file: 
+        json.dump(data, file, indent=4)
+
+def show_sidebar(df, edited_df):
+    with st.sidebar:
+        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))
+            
+            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)
+            
+            if selected_user_name and commit_message:
+                st.session_state.push_button_disabled = False
+            else:
+                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:
+                    if diff_remote_head():
+                        if df.equals(edited_df):
+                            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:
+                        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()
+        
+        st.subheader('Draft a new release')
+        with st.expander('Draft a new release'):
+            tags = [tag.name for tag in get_tags()]
+            tags.insert(0, '')
+            new_tag = st.text_input('Create a new tag')
+            
+            if new_tag:
+                if new_tag in tags:
+                    st.warning('Existing tag', icon='⚠️')
+                else:
+                    tags.insert(0, new_tag)
+            
+            selected_tag = st.selectbox('Choose a tag', tags)
+            release_title = st.text_input('Release title', value=selected_tag)
+            release_describe = st.text_area('Describe this release', value='## Production에 변경된 Version')
+            
+            if selected_tag and release_title and release_describe:
+                st.session_state.release_button_disabled = False
+            else:
+                st.session_state.release_button_disabled = True
+            
+            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)
+                    
+                    if response.status_code == 201:
+                        logger.info(f'Publish Release - Release created successfully')
+                        st.success('Release created successfully', icon='✅')
+                        git_pull()
+                        streamlit_js_eval(js_expressions='parent.window.location.reload()')
+                    else:
+                        logger.error(f'Publish Release - Failed to create release. Status code: {response.status_code}')
+                        logger.error(f'Response: {response.text}')
+                        st.error(f'Failed to create release. Status code: {response.status_code}\n\n Response: {response.text}', icon='🚨')
+        
+        st.divider()

requirements-dashboard.txt

@@ -0,0 +1,3 @@
+GitPython==3.1.32
+streamlit==1.25.0
+streamlit_js_eval==0.1.5

version.json

@@ -1,21 +1,21 @@
 {
-    "datasaker": "dsk-23.03.8",
+    "datasaker": "dsk-23.03.13",
     "service": [
         {
             "type": "front",
             "name": "dsk-ui",
-            "latest_candidate_version": "release-0.2.10",
-            "candidate_version": "release-0.2.10",
-            "release_version": "release-0.2.10",
-            "product_version": "release-0.2.10"
+            "latest_candidate_version": "release-0.2.22",
+            "candidate_version": "release-0.2.22",
+            "release_version": "release-0.2.22",
+            "product_version": "release-0.2.22"
         },
         {
             "type": "api",
             "name": "dsk-agent-api",
-            "latest_candidate_version": "release-0.1.13",
-            "candidate_version": "release-0.1.13",
-            "release_version": "release-0.1.13",
-            "product_version": "release-0.1.13"
+            "latest_candidate_version": "release-0.1.15",
+            "candidate_version": "release-0.1.15",
+            "release_version": "release-0.1.15",
+            "product_version": "release-0.1.15"
         },
         {
             "type": "api",
@@ -28,26 +28,26 @@
         {
             "type": "api",
             "name": "dsk-alert-api",
+            "latest_candidate_version": "release-0.1.17",
+            "candidate_version": "release-0.1.17",
+            "release_version": "release-0.1.17",
+            "product_version": "release-0.1.17"
+        },
+        {
+            "type": "api",
+            "name": "dsk-apm-api",
             "latest_candidate_version": "release-0.1.15",
             "candidate_version": "release-0.1.15",
             "release_version": "release-0.1.15",
             "product_version": "release-0.1.15"
         },
-        {
-            "type": "api",
-            "name": "dsk-apm-api",
-            "latest_candidate_version": "release-0.1.14",
-            "candidate_version": "release-0.1.14",
-            "release_version": "release-0.1.14",
-            "product_version": "release-0.1.14"
-        },
         {
             "type": "api",
             "name": "dsk-chart-api",
-            "latest_candidate_version": "release-0.2.5",
-            "candidate_version": "release-0.2.5",
-            "release_version": "release-0.2.5",
-            "product_version": "release-0.2.5"
+            "latest_candidate_version": "release-0.2.8",
+            "candidate_version": "release-0.2.8",
+            "release_version": "release-0.2.8",
+            "product_version": "release-0.2.8"
         },
         {
             "type": "api",
@@ -60,34 +60,34 @@
         {
             "type": "api",
             "name": "dsk-database-api",
-            "latest_candidate_version": "release-0.1.14",
-            "candidate_version": "release-0.1.14",
-            "release_version": "release-0.1.14",
-            "product_version": "release-0.1.14"
+            "latest_candidate_version": "release-0.1.26",
+            "candidate_version": "release-0.1.26",
+            "release_version": "release-0.1.26",
+            "product_version": "release-0.1.26"
         },
         {
             "type": "api",
             "name": "dsk-infrastructure-api",
-            "latest_candidate_version": "release-0.1.14",
-            "candidate_version": "release-0.1.14",
-            "release_version": "release-0.1.14",
-            "product_version": "release-0.1.14"
+            "latest_candidate_version": "release-0.1.15",
+            "candidate_version": "release-0.1.15",
+            "release_version": "release-0.1.15",
+            "product_version": "release-0.1.15"
         },
         {
             "type": "api",
             "name": "dsk-log-api",
-            "latest_candidate_version": "release-0.1.11",
-            "candidate_version": "release-0.1.11",
-            "release_version": "release-0.1.11",
-            "product_version": "release-0.1.11"
+            "latest_candidate_version": "release-0.1.12",
+            "candidate_version": "release-0.1.12",
+            "release_version": "release-0.1.12",
+            "product_version": "release-0.1.12"
         },
         {
             "type": "api",
             "name": "dsk-notification-api",
-            "latest_candidate_version": "release-0.2.5",
-            "candidate_version": "release-0.2.5",
-            "release_version": "release-0.2.5",
-            "product_version": "release-0.2.5"
+            "latest_candidate_version": "release-0.2.6",
+            "candidate_version": "release-0.2.6",
+            "release_version": "release-0.2.6",
+            "product_version": "release-0.2.6"
         },
         {
             "type": "api",
@@ -100,9 +100,9 @@
         {
             "type": "api",
             "name": "dsk-app-sender",
-            "latest_candidate_version": "release-0.2.0",
-            "candidate_version": "release-0.2.0",
-            "release_version": "release-0.2.0",
+            "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"
         },
         {
@@ -140,10 +140,10 @@
         {
             "type": "api",
             "name": "dsk-billing-api",
-            "latest_candidate_version": "release-0.1.1",
-            "candidate_version": "release-0.1.1",
-            "release_version": "",
-            "product_version": "release-0.1.1"
+            "latest_candidate_version": "release-0.1.2",
+            "candidate_version": "release-0.1.2",
+            "release_version": "release-0.1.2",
+            "product_version": "release-0.1.2"
         },
         {
             "type": "stream",
@@ -188,10 +188,10 @@
         {
             "type": "stream",
             "name": "dsk-tagging-connector",
-            "latest_candidate_version": "release-0.1.9",
-            "candidate_version": "release-0.1.9",
-            "release_version": "release-0.1.9",
-            "product_version": "release-0.1.9"
+            "latest_candidate_version": "release-0.1.10",
+            "candidate_version": "release-0.1.10",
+            "release_version": "release-0.1.10",
+            "product_version": "release-0.1.10"
         },
         {
             "type": "stream",
@@ -199,7 +199,7 @@
             "latest_candidate_version": "release-0.1.3",
             "candidate_version": "release-0.1.3",
             "release_version": "release-0.1.3",
-            "product_version": "release-0.1.2"
+            "product_version": "release-0.1.3"
         },
         {
             "type": "stream",
@@ -215,15 +215,15 @@
             "latest_candidate_version": "release-0.1.6",
             "candidate_version": "release-0.1.6",
             "release_version": "release-0.1.6",
-            "product_version": "release-0.1.4"
+            "product_version": "release-0.1.6"
         },
         {
             "type": "datagate",
             "name": "dsk-loggate",
-            "latest_candidate_version": "release-0.1.4",
-            "candidate_version": "release-0.1.4",
-            "release_version": "release-0.1.3",
-            "product_version": "release-0.1.3"
+            "latest_candidate_version": "release-0.1.5",
+            "candidate_version": "release-0.1.5",
+            "release_version": "release-0.1.5",
+            "product_version": "release-0.1.5"
         }
     ]
 }