Merge branch 'main' into main

paas/sw-frontend/config/webpackDevServer.config.js

@@ -78,7 +78,7 @@ module.exports = function (proxy, allowedHost) {
     public: allowedHost,
     proxy: {
       "/gateway": {
-        target: "http://sreworks.c38cca9c474484bdc9873f44f733d8bcd.cn-beijing.alicontainer.com/",
+        target: "",
         changeOrigin: true,
         cookieDomainRewrite:"localhost"
         // cookieDomainRewrite: "30.225.0.197"

paas/sw-frontend/docs/documents/rr5g10.md

@@ -38,7 +38,7 @@ cd sreworks/chart/sreworks-chart
 # 安装SREWorks
 helm install sreworks ./ \
     --create-namespace --namespace sreworks \
-    --set appmanager.home.url="http://sreworks-*.cn-hangzhou.alicontainer.com" \
+    --set appmanager.home.url="https://your-website.***.com" \
     --set global.storageClass="alicloud-disk-available"
 ```
 
@@ -52,7 +52,7 @@ cd sreworks/chart/sreworks-chart
 # 安装SREWorks
 helm install sreworks ./ \
     --create-namespace --namespace sreworks \
-    --set appmanager.home.url="http://sreworks-*.cn-hangzhou.alicontainer.com" \
+    --set appmanager.home.url="https://your-website.***.com" \
     --set global.storageClass="local"
 ```
 

paas/sw-frontend/src/properties.js

@@ -39,9 +39,9 @@ let properties = {
  */
 // 本地开发环境配置
 const development = {
-    baseUrl: 'http://sreworks.c38cca9c474484bdc9873f44f733d8bcd.cn-beijing.alicontainer.com/',
-    apiEndpoint: 'http://sreworks.c38cca9c474484bdc9873f44f733d8bcd.cn-beijing.alicontainer.com/',
-    gateway: 'http://sreworks.c38cca9c474484bdc9873f44f733d8bcd.cn-beijing.alicontainer.com/'
+    baseUrl: '',
+    apiEndpoint: '',
+    gateway: ''
 };
 // 日常环境配置项
 const daily = {
@@ -51,7 +51,7 @@ const daily = {
 };
 // mocks 环境配置
 const mocks = {
-    baseUrl: 'http://rap2api.alibaba-inc.com/app/mock/2727'
+    baseUrl: ''
 };
 // 预发环境配置项
 const prepub = {

saas/cluster/api/clustermanage/client-deploy-packages/skywalking/skywalking-chart/templates/elasticsearch-proxy-config.yaml

@@ -15,6 +15,5 @@ data:
             index  index.html index.htm;
 
             proxy_pass {{ .Values.elasticsearchEndpint }};
-            #proxy_pass http://sreworks.c38cca9c474484bdc9873f44f733d8bcd.cn-beijing.alicontainer.com/gateway/elasticsearch/;
         }
     }

saas/cluster/api/clustermanage/client-deploy-packages/skywalking/values.yaml

@@ -10,4 +10,4 @@ elasticsearch:
     port:
       http: 9200
 
-elasticsearchEndpint: http://sreworks.c38cca9c474484bdc9873f44f733d8bcd.cn-beijing.alicontainer.com/gateway/elasticsearch/
+elasticsearchEndpint: http://test.com/gateway/elasticsearch/

saas/dataops/api/dataset/APP-META-PRIVATE/postrun/job/collect/collect_job_config.json

@@ -172,7 +172,7 @@
       "alias": "应用构建部署效率统计(内置)",
       "execTimeout": 600,
       "execType": "python",
-      "execContent": "# coding: utf-8\n\nimport datetime\nimport json\nimport requests\n\nheaders = {}\nhost = {\n    \"dataset\": \"http://prod-dataops-dataset.sreworks-dataops.svc.cluster.local:80\",\n}\n\naccount_super_client_id = \"common\"\naccount_super_id = \"admin\"\naccount_super_client_secret = \"common-9efab2399c7c560b34de477b9aa0a465\"\naccount_super_secret_key = \"test-super-secret-key\"\n\npage_size = 1000\none_millisecond = 1000\none_minute_millisecond = 60000\none_hour_millisecond = 3600000\n\n\ndef _do_query_dataset_interface(basic_url):\n    page_num = 1\n    datas = []\n    while True:\n        url = basic_url + \"&pageNum=\" + str(page_num)\n        r = requests.get(url, headers=headers)\n        if r.status_code != 200:\n            break\n\n        ret = r.json().get(\"data\", None)\n        if ret and ret.get(\"datas\"):\n            datas.extend(ret.get(\"datas\"))\n            _total_num = int(ret.get(\"totalNum\"))\n            _page_size = int(ret.get(\"pageSize\"))\n            _page_num = int(ret.get(\"pageNum\"))\n            if _page_size > _total_num:\n                break\n            else:\n                page_num = _page_num + 1\n        else:\n            break\n\n    return datas\n\n\ndef get_dd_efficiency():\n    team_user_url = host[\"dataset\"] + f'''/interface/team_user?pageSize={page_size}'''\n    team_users = _do_query_dataset_interface(team_user_url)\n\n    team_user_cnt = {}\n    for team_user in team_users:\n        team_id = team_user[\"teamId\"]\n        if team_id in team_user_cnt:\n            team_user_cnt[team_id] += 1\n        else:\n            team_user_cnt[team_id] = 1\n\n    dt = datetime.datetime.now()\n    yesterday_dt = dt + datetime.timedelta(days=-1)\n    start_ds = yesterday_dt.strftime(\"%Y%m%d\")\n\n    now_day_dt = dt.replace(hour=0, minute=0, second=0, microsecond=0)\n    end_timestamp = int(now_day_dt.timestamp()) * one_millisecond\n    start_timestamp = end_timestamp - 86400000\n\n    dd_quality_url = host[\"dataset\"] + f'''/interface/app_delivery_deployment_quality?sTimestamp={start_timestamp}&eTimestamp={end_timestamp}&pageSize={page_size}'''\n    dd_qualities = _do_query_dataset_interface(dd_quality_url)\n\n    efficiencies = []\n    for quality in dd_qualities:\n        team_id = quality[\"teamId\"]\n        team_member_cnt = team_user_cnt[team_id]\n        efficiency = {\n            \"id\": quality[\"appInstanceId\"],\n            \"ds\": start_ds,\n            \"appId\": quality[\"appId\"],\n            \"appInstanceId\": quality[\"appInstanceId\"],\n            \"appInstanceName\": quality[\"appInstanceName\"],\n            \"teamId\": team_id,\n            \"teamMemberCnt\": team_member_cnt,\n            \"deliveryCntDailyAdditions\": quality[\"deliveryCntDailyAdditions\"],\n            \"deploymentCntDailyAdditions\": quality[\"deploymentCntDailyAdditions\"],\n            \"hrEffectivenessRatioDaily\": (quality[\"deploymentCntDailyAdditions\"] + quality[\"deliveryCntDailyAdditions\"]) / team_member_cnt,\n            \"timestamp\": start_timestamp\n        }\n        efficiencies.append(efficiency)\n    return efficiencies\n\n\nprint(json.dumps(get_dd_efficiency()))\n",
+      "execContent": "# coding: utf-8\n\nimport datetime\nimport json\nimport time\n\nimport requests\n\nheaders = {}\nhost = {\n    \"dataset\": \"http://prod-dataops-dataset.sreworks-dataops.svc.cluster.local:80\",\n}\n\naccount_super_client_id = \"common\"\naccount_super_id = \"admin\"\naccount_super_client_secret = \"common-9efab2399c7c560b34de477b9aa0a465\"\naccount_super_secret_key = \"test-super-secret-key\"\n\npage_size = 1000\none_millisecond = 1000\none_minute_millisecond = 60000\none_hour_millisecond = 3600000\n\n\ndef _retry_get_request(url):\n    ret = {}\n\n    max_retry_times = 3\n    cur_retry_time = 0\n    while cur_retry_time < max_retry_times:\n        cur_retry_time += 1\n        r = requests.get(url, headers=headers)\n        if r.status_code == 200:\n            ret = r.json().get(\"data\", {})\n            break\n        time.sleep(10)\n\n    return ret\n\n\ndef _do_query_dataset_interface(basic_url):\n    page_num = 1\n    datas = []\n    while True:\n        url = basic_url + \"&pageNum=\" + str(page_num)\n        ret = _retry_get_request(url)\n        if ret and ret.get(\"datas\"):\n            datas.extend(ret.get(\"datas\"))\n            _total_num = int(ret.get(\"totalNum\"))\n            _page_size = int(ret.get(\"pageSize\"))\n            _page_num = int(ret.get(\"pageNum\"))\n            if _page_size > _total_num:\n                break\n            else:\n                page_num = _page_num + 1\n        else:\n            break\n\n    return datas\n\n\ndef get_dd_efficiency():\n    team_user_url = host[\"dataset\"] + f'''/interface/team_user?pageSize={page_size}'''\n    team_users = _do_query_dataset_interface(team_user_url)\n\n    team_user_cnt = {}\n    for team_user in team_users:\n        team_id = team_user[\"teamId\"]\n        if team_id in team_user_cnt:\n            team_user_cnt[team_id] += 1\n        else:\n            team_user_cnt[team_id] = 1\n\n    dt = datetime.datetime.now()\n    yesterday_dt = dt + datetime.timedelta(days=-1)\n    start_ds = yesterday_dt.strftime(\"%Y%m%d\")\n\n    now_day_dt = dt.replace(hour=0, minute=0, second=0, microsecond=0)\n    end_timestamp = int(now_day_dt.timestamp()) * one_millisecond\n    start_timestamp = end_timestamp - 86400000\n\n    dd_quality_url = host[\"dataset\"] + f'''/interface/app_delivery_deployment_quality?sTimestamp={start_timestamp}&eTimestamp={end_timestamp}&pageSize={page_size}'''\n    dd_qualities = _do_query_dataset_interface(dd_quality_url)\n\n    efficiencies = []\n    for quality in dd_qualities:\n        team_id = quality[\"teamId\"]\n        team_member_cnt = team_user_cnt[team_id]\n        efficiency = {\n            \"id\": quality[\"appInstanceId\"],\n            \"ds\": start_ds,\n            \"appId\": quality[\"appId\"],\n            \"appInstanceId\": quality[\"appInstanceId\"],\n            \"appInstanceName\": quality[\"appInstanceName\"],\n            \"teamId\": team_id,\n            \"teamMemberCnt\": team_member_cnt,\n            \"deliveryCntDailyAdditions\": quality[\"deliveryCntDailyAdditions\"],\n            \"deploymentCntDailyAdditions\": quality[\"deploymentCntDailyAdditions\"],\n            \"hrEffectivenessRatioDaily\": (quality[\"deploymentCntDailyAdditions\"] + quality[\"deliveryCntDailyAdditions\"]) / team_member_cnt,\n            \"timestamp\": start_timestamp\n        }\n        efficiencies.append(efficiency)\n    return efficiencies\n\n\nprint(json.dumps(get_dd_efficiency()))\n",
       "execRetryTimes": 0,
       "execRetryInterval": 0,
       "varConf": {},