Compare commits
43 Commits
dsk-23.03.
...
dsk-23.03.
| Author | SHA1 | Date | |
|---|---|---|---|
|
ca5dacf06f | ||
|
|
2cc4bab16a | ||
|
|
4cdb204377 | ||
|
|
abe0f1951d | ||
|
|
65e37217ef | ||
|
|
c90e90b614 | ||
|
|
4f2b226504 | ||
|
|
f36c0fbf74 | ||
|
|
854a7b2a70 | ||
|
|
f81113e7ee | ||
|
|
ef7657a7d8 | ||
|
|
fb7b9e6f78 | ||
|
|
aadbfef0d4 | ||
|
|
b51d0c6823 | ||
|
|
c4c9498e56 | ||
|
|
935439909e | ||
|
|
ac859019c5 | ||
|
|
c3cccd136a | ||
|
|
2174b7b76f | ||
|
|
34b1b2aab2 | ||
|
|
46fe51bc6f | ||
|
|
2dca0a6261 | ||
|
|
2f9e4b2fbd | ||
|
|
1f2bdd9323 | ||
|
|
44216710f7 | ||
|
|
a86d0a685e | ||
|
|
f63270166c | ||
|
|
a85931f6d5 | ||
|
|
26f793de59 | ||
|
|
c105249df6 | ||
|
|
6dfec1cccd | ||
|
|
cad101ac40 | ||
|
|
2a787369c1 | ||
|
|
24928daf28 | ||
|
|
5d7d3746ef | ||
|
|
392f2ab4a0 | ||
|
|
144485ddb7 | ||
|
|
ee6352148e | ||
|
|
b9d07eba82 | ||
|
|
cb6c3578f6 | ||
|
|
e57590d5f9 | ||
|
|
b0a5fc93c4 | ||
|
|
58cf477006 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
__pycache__
|
||||
__pycache__
|
||||
dashboard/version-management.log
|
||||
14
README.md
14
README.md
@@ -1,20 +1,20 @@
|
||||
# DataSaker
|
||||
### dsk-23.03.13
|
||||
### dsk-23.03.15
|
||||
|
||||
# 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 |
|
||||
| api | dsk-agent-api | release-0.1.15 | release-0.1.15 | release-0.1.14 |
|
||||
| front | dsk-ui | release-0.2.30 | release-0.2.30 | release-0.2.22 |
|
||||
| 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.19 | release-0.1.19 | 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-chart-api | release-0.2.11 | release-0.2.11 | release-0.2.9 |
|
||||
| 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.27 | release-0.1.27 | release-0.1.26 |
|
||||
| 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-notification-api | release-0.2.9 | release-0.2.9 | 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.1 | release-0.2.1 | release-0.2.0 |
|
||||
| api | dsk-backoffice | | | |
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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):
|
||||
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'
|
||||
def get_user_email(username):
|
||||
if username == 'dsk-minchulahn': return 'minchulahn@ex-em.com'
|
||||
elif username == 'Ose-Exem': return 'ose@ex-em.com'
|
||||
elif username == 'deukjin': return 'djkim@ex-em.com'
|
||||
elif username == '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 set_git_config(username, email):
|
||||
subprocess.run(["git", "config", "--global", "user.name", username], check=True)
|
||||
subprocess.run(["git", "config", "--global", "user.email", email], check=True)
|
||||
|
||||
def diff():
|
||||
if len(repo.index.diff(repo.head.commit)) > 0:
|
||||
|
||||
@@ -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)
|
||||
|
||||
44
version.json
44
version.json
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"datasaker": "dsk-23.03.13",
|
||||
"datasaker": "dsk-23.03.15",
|
||||
"service": [
|
||||
{
|
||||
"type": "front",
|
||||
"name": "dsk-ui",
|
||||
"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"
|
||||
"latest_candidate_version": "release-0.2.30",
|
||||
"candidate_version": "release-0.2.30",
|
||||
"release_version": "release-0.2.30",
|
||||
"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",
|
||||
"candidate_version": "release-0.1.17",
|
||||
"release_version": "release-0.1.17",
|
||||
"product_version": "release-0.1.17"
|
||||
"latest_candidate_version": "release-0.1.19",
|
||||
"candidate_version": "release-0.1.19",
|
||||
"release_version": "release-0.1.19",
|
||||
"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",
|
||||
"candidate_version": "release-0.2.8",
|
||||
"release_version": "release-0.2.8",
|
||||
"product_version": "release-0.2.8"
|
||||
"latest_candidate_version": "release-0.2.11",
|
||||
"candidate_version": "release-0.2.11",
|
||||
"release_version": "release-0.2.11",
|
||||
"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",
|
||||
"candidate_version": "release-0.1.26",
|
||||
"release_version": "release-0.1.26",
|
||||
"product_version": "release-0.1.26"
|
||||
"latest_candidate_version": "release-0.1.27",
|
||||
"candidate_version": "release-0.1.27",
|
||||
"release_version": "release-0.1.27",
|
||||
"product_version": "release-0.1.27"
|
||||
},
|
||||
{
|
||||
"type": "api",
|
||||
@@ -84,10 +84,10 @@
|
||||
{
|
||||
"type": "api",
|
||||
"name": "dsk-notification-api",
|
||||
"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"
|
||||
"latest_candidate_version": "release-0.2.9",
|
||||
"candidate_version": "release-0.2.9",
|
||||
"release_version": "release-0.2.9",
|
||||
"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",
|
||||
|
||||
Reference in New Issue
Block a user