packages/A-Ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udpate a-ops to v1.2.0

Browse Source
This commit is contained in:
wenxin 2023-04-18 11:20:24 +08:00
parent ebc0c1150f
commit 4da6b41cf9
11 changed files with 83 additions and 854 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-fix-diag-return.patch
View File

@ -1,25 +0,0 @@
From 8c73f575b7a61b965b173e8267d8a389f48d5190 Mon Sep 17 00:00:00 2001
From: gitee-cmd <chemingdao@huawei.com>
Date: Sun, 26 Sep 2021 22:04:31 +0800
Subject: [PATCH] fix diag return
---
adoctor-cli/adoctor_cli/commands/diag_cmd.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/adoctor-cli/adoctor_cli/commands/diag_cmd.py b/adoctor-cli/adoctor_cli/commands/diag_cmd.py
index fb03a0c..9852a9d 100644
--- a/adoctor-cli/adoctor_cli/commands/diag_cmd.py
+++ b/adoctor-cli/adoctor_cli/commands/diag_cmd.py
@@ -143,6 +143,7 @@ class DiagCommand(BaseCommand):
}
result = request_without_print('POST', diag_url, pyload, header, params.access_token)
print(pretty_json(result))
+ return
times -= 1
print("There is no task can be found in diagnosis scheduler, please try again.")
--
2.24.3 (Apple Git-128)

39
0002-fix-log-of-task-execution.patch
View File

@ -1,39 +0,0 @@
From 5d3a4e2c819d0901994b01f8a33ee0f4fc55fe90 Mon Sep 17 00:00:00 2001
From: gitee-cmd <chemingdao@huawei.com>
Date: Wed, 29 Sep 2021 19:11:28 +0800
Subject: [PATCH] fix log of task execution
---
aops-manager/aops_manager/deploy_manager/view.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/aops-manager/aops_manager/deploy_manager/view.py b/aops-manager/aops_manager/deploy_manager/view.py
index 8d6811b..7a68742 100644
--- a/aops-manager/aops_manager/deploy_manager/view.py
+++ b/aops-manager/aops_manager/deploy_manager/view.py
@@ -195,13 +195,13 @@ class ExecuteTask(Resource):
Args:
inventory(instance): instance of InventoryBuilder
task_id(str): id of a task.
- Returns:
- bool: The execution flag of the task
"""
res = TaskRunner.run_task(task_id, HostKey.key)
inventory.remove_host_vars_in_inventory()
- LOGGER.info("Task %s execution succeed.", task_id)
- return res
+ if res:
+ LOGGER.error("Task %s execution succeeded.", task_id)
+ return
+ LOGGER.error("Task %s execution failed.", task_id)
class ImportTemplate(Resource):
@@ -284,3 +284,4 @@ class DeleteTemplate(Resource):
verify_res, 'delete', database_url, args)
return jsonify(response)
+
--
2.30.0

93
0003-add-permission-control-in-ragdoll.patch
View File

@ -1,93 +0,0 @@
From d3f717d13d2ea70bdcb31dfcef4f7f163f84660e Mon Sep 17 00:00:00 2001
From: orange-snn <songnannan2@huawei.com>
Date: Wed, 29 Sep 2021 18:44:52 +0800
Subject: [PATCH] change the attr of the path in ragdoll
---
gala-ragdoll/ragdoll/controllers/domain_controller.py | 1 +
gala-ragdoll/ragdoll/controllers/format.py | 1 +
gala-ragdoll/ragdoll/controllers/host_controller.py | 4 ++++
gala-ragdoll/ragdoll/utils/conf_tools.py | 2 ++
gala-ragdoll/ragdoll/utils/prepare.py | 1 +
5 files changed, 9 insertions(+)
diff --git a/gala-ragdoll/ragdoll/controllers/domain_controller.py b/gala-ragdoll/ragdoll/controllers/domain_controller.py
index ba9c6ce6..3c14dba9 100644
--- a/gala-ragdoll/ragdoll/controllers/domain_controller.py
+++ b/gala-ragdoll/ragdoll/controllers/domain_controller.py
@@ -46,6 +46,7 @@ def create_domain(body=None): # noqa: E501
else:
successDomain.append(tempDomainName)
domainPath = os.path.join(TARGETDIR, tempDomainName)
+ os.umask(0o077)
os.mkdir(domainPath)
if len(failedDomain) == 0:
diff --git a/gala-ragdoll/ragdoll/controllers/format.py b/gala-ragdoll/ragdoll/controllers/format.py
index c302a357..6f03986f 100644
--- a/gala-ragdoll/ragdoll/controllers/format.py
+++ b/gala-ragdoll/ragdoll/controllers/format.py
@@ -91,6 +91,7 @@ class Format(object):
@staticmethod
def addHostToFile(d_file, host):
info_json = json.dumps(str(host), sort_keys=False, indent=4, separators=(',', ': '))
+ os.umask(0o077)
with open(d_file, 'a+') as host_file:
host_file.write(info_json)
host_file.write("\n")
diff --git a/gala-ragdoll/ragdoll/controllers/host_controller.py b/gala-ragdoll/ragdoll/controllers/host_controller.py
index 75f767b2..441abde4 100644
--- a/gala-ragdoll/ragdoll/controllers/host_controller.py
+++ b/gala-ragdoll/ragdoll/controllers/host_controller.py
@@ -143,12 +143,16 @@ def delete_host_in_domain(body=None): # noqa: E501
codeNum = 500
base_rsp = BaseResponse(codeNum, "The host delete failed.")
return base_rsp, codeNum
+ codeNum = 200
+ base_rsp = BaseResponse(codeNum, "All hosts are deleted in the current domain.")
+ return base_rsp, codeNum
# If the domain exists, check whether the current input parameter host belongs to the corresponding
# domain. If the host is in the domain, the host is deleted. If the host is no longer in the domain,
# the host is added to the failure range
containedInHost = []
notContainedInHost = []
+ os.umask(0o077)
for hostInfo in hostInfos:
hostId = hostInfo.host_id
isContained = False
diff --git a/gala-ragdoll/ragdoll/utils/conf_tools.py b/gala-ragdoll/ragdoll/utils/conf_tools.py
index cb051a4a..205f236c 100644
--- a/gala-ragdoll/ragdoll/utils/conf_tools.py
+++ b/gala-ragdoll/ragdoll/utils/conf_tools.py
@@ -406,6 +406,7 @@ class ConfTools(object):
"""
res = False
cwd = os.getcwd()
+ os.umask(0o077)
if not os.path.exists(self._target_dir):
os.mkdir(self._target_dir)
@@ -583,6 +584,7 @@ class ConfTools(object):
"""
res = False
path_delete_last = ""
+ os.umask(0o077)
if not os.path.exists(path):
paths = path.split('/')
for d_index in range(0, len(paths) - 1):
diff --git a/gala-ragdoll/ragdoll/utils/prepare.py b/gala-ragdoll/ragdoll/utils/prepare.py
index f8bc7314..a8a06c0a 100644
--- a/gala-ragdoll/ragdoll/utils/prepare.py
+++ b/gala-ragdoll/ragdoll/utils/prepare.py
@@ -20,6 +20,7 @@ class Prepare(object):
if os.path.exists(self._target_dir):
rest = self.git_init(username, useremail)
return rest
+ os.umask(0o077)
cmd1 = "mkdir -p {}".format(self._target_dir)
git_tools = GitTools(self._target_dir)
mkdir_code = git_tools.run_shell_return_code(cmd1)
--
Gitee

55
0004-fix-logos-instructions-and-size.patch
View File

@ -1,55 +0,0 @@
From 1e99582df4fd558ed52ee3d3c4b6522b2251000f Mon Sep 17 00:00:00 2001
From: gitee-cmd <chemingdao@huawei.com>
Date: Thu, 30 Sep 2021 09:33:56 +0800
Subject: [PATCH] fix logos' instructions and size
---
aops-web/src/appCore/components/GlobalFooter/index.vue | 2 +-
aops-web/src/appCore/layouts/BasicLayout.vue | 6 +++++-
aops-web/src/appCore/layouts/UserLayout.vue | 1 -
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/aops-web/src/appCore/components/GlobalFooter/index.vue b/aops-web/src/appCore/components/GlobalFooter/index.vue
index 839ddc8..b485907 100644
--- a/aops-web/src/appCore/components/GlobalFooter/index.vue
+++ b/aops-web/src/appCore/components/GlobalFooter/index.vue
@@ -11,7 +11,7 @@
</div>
</template>
<template v-slot:copyright>
- logo
+ <img src="~@/assets/horizontal-left.png" style="height: 20px" class="logo" alt="logo">
</template>
</global-footer>
</template>
diff --git a/aops-web/src/appCore/layouts/BasicLayout.vue b/aops-web/src/appCore/layouts/BasicLayout.vue
index e4fd9f8..ca29cdc 100644
--- a/aops-web/src/appCore/layouts/BasicLayout.vue
+++ b/aops-web/src/appCore/layouts/BasicLayout.vue
@@ -139,6 +139,10 @@ export default {
}
</script>
-<style lang="less">
+<style lang="less" scoped>
@import "./BasicLayout.less";
+.logo {
+ height: auto;
+ width: 32px;
+}
</style>
diff --git a/aops-web/src/appCore/layouts/UserLayout.vue b/aops-web/src/appCore/layouts/UserLayout.vue
index 36826de..15eb79d 100644
--- a/aops-web/src/appCore/layouts/UserLayout.vue
+++ b/aops-web/src/appCore/layouts/UserLayout.vue
@@ -126,7 +126,6 @@ export default {
.logo {
height: 80px;
vertical-align: top;
- margin-right: 16px;
border-style: none;
}
--
2.30.0

215
0005-fix-the-python3-libselinux-dependency.patch
View File

@ -1,215 +0,0 @@
From fe8dbb66a6d383845d33601f58ed9bf7bfabed1c Mon Sep 17 00:00:00 2001
From: gitee-cmd <chemingdao@huawei.com>
Date: Tue, 22 Feb 2022 22:13:18 +0800
Subject: [PATCH] fix the python3-libselinux dependency
---
.../tasks/install_adoctor_check_executor.yml | 1 +
.../tasks/install_adoctor_check_scheduler.yml | 1 +
.../tasks/install_adoctor_diag_executor.yml | 1 +
.../tasks/install_adoctor_diag_scheduler.yml | 1 +
.../roles/elasticsearch/tasks/install_elasticsearch.yml | 1 +
.../roles/fluentd/tasks/install_fluentd.yml | 1 +
.../roles/gala_gopher/tasks/install_gala_gopher.yml | 1 +
.../roles/gala_ragdoll/tasks/install_gala_ragdoll.yml | 1 +
.../roles/gala_spider/tasks/install_gala_spider.yml | 1 +
.../ansible_handler/roles/kafka/tasks/install_kafka.yml | 1 +
.../ansible_handler/roles/kafka/tasks/start_kafka.yml | 2 +-
.../ansible_handler/roles/mysql/tasks/install_mysql.yml | 1 +
.../roles/node_exporter/tasks/install_node_exporter.yml | 1 +
.../roles/prometheus/tasks/install_prometheus.yml | 1 +
.../ansible_handler/roles/read_config/tasks/main.yml | 8 ++++++++
.../roles/zookeeper/tasks/install_zookeeper.yml | 1 +
aops-manager/aops_manager/deploy_manager/view.py | 2 +-
17 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml
index daf4bee8..dcc1de75 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_executor/tasks/install_adoctor_check_executor.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- adoctor-check-executor
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml
index e3315fe9..8085a62c 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_check_scheduler/tasks/install_adoctor_check_scheduler.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- adoctor-check-scheduler
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml
index c7019508..dec4cc6b 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_executor/tasks/install_adoctor_diag_executor.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- adoctor-diag-executor
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml
index c833c82f..b0800be3 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/adoctor_diag_scheduler/tasks/install_adoctor_diag_scheduler.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- adoctor-diag-scheduler
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml
index 933e7cc5..f8bb1540 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/elasticsearch/tasks/install_elasticsearch.yml
@@ -18,4 +18,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- elasticsearch
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml
index b6e2c02a..1ff58a0a 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/fluentd/tasks/install_fluentd.yml
@@ -5,6 +5,7 @@
dnf:
state: latest
name:
+ - python3-libselinux
- rubygem-fluentd
- rubygem-fluent-plugin-elasticsearch
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml
index 1e3e89bb..f1431559 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_gopher/tasks/install_gala_gopher.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- gala-gopher
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml
index bbcaec3c..09343941 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_ragdoll/tasks/install_gala_ragdoll.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- python3-gala-ragdoll
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml
index e93a6b73..b4b8e4d0 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/gala_spider/tasks/install_gala_spider.yml
@@ -5,5 +5,6 @@
dnf:
state: latest
name:
+ - python3-libselinux
- gala-spider
- python3-gala-spider
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml
index 9a90ca75..6fa8da8f 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/install_kafka.yml
@@ -18,6 +18,7 @@
dnf:
state: latest
name:
+ - python3-libselinux
- kafka
- name: Copy kafka.service file
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml
index 313ef742..9272348a 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/kafka/tasks/start_kafka.yml
@@ -8,4 +8,4 @@
# Checking the Service Status
- name: Verify kafka is listening on {{ kafka_port }}
- wait_for: host={{ ansible_host }} port={{ kafka_port }} delay=10 timeout=20
+ wait_for: host={{ ansible_host }} port={{ kafka_port }} delay=20 timeout=40
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml
index 93733efa..94a0f6a2 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/mysql/tasks/install_mysql.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- mysql-server
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml
index 0913e7f2..813da8e6 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/node_exporter/tasks/install_node_exporter.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- node_exporter
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml
index 3305a673..30adf85b 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/prometheus/tasks/install_prometheus.yml
@@ -5,4 +5,5 @@
dnf:
state: latest
name:
+ - python3-libselinux
- prometheus2
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml
index 3067c5be..775f5513 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/read_config/tasks/main.yml
@@ -1,4 +1,12 @@
---
+- name: Install python3-libselinux
+ become: true
+ become_user: root
+ dnf:
+ state: latest
+ name:
+ - python3-libselinux
+
- name: Check that if the file exists
stat:
path: "{{ item.src }}"
diff --git a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml
index f47f194a..69f14b47 100644
--- a/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml
+++ b/aops-manager/aops_manager/deploy_manager/ansible_handler/roles/zookeeper/tasks/install_zookeeper.yml
@@ -5,6 +5,7 @@
dnf:
state: latest
name:
+ - python3-libselinux
- zookeeper
- name: Create Data Dir
diff --git a/aops-manager/aops_manager/deploy_manager/view.py b/aops-manager/aops_manager/deploy_manager/view.py
index 7a687428..86e9332f 100644
--- a/aops-manager/aops_manager/deploy_manager/view.py
+++ b/aops-manager/aops_manager/deploy_manager/view.py
@@ -199,7 +199,7 @@ class ExecuteTask(Resource):
res = TaskRunner.run_task(task_id, HostKey.key)
inventory.remove_host_vars_in_inventory()
if res:
- LOGGER.error("Task %s execution succeeded.", task_id)
+ LOGGER.info("Task %s execution succeeded.", task_id)
return
LOGGER.error("Task %s execution failed.", task_id)
--
2.33.0

BIN
A-Ops-v1.1.1.tar.gz
View File

Binary file not shown.

BIN
A-Ops-v1.3.0.tar.gz Normal file
View File

Binary file not shown.

BIN
A-Ops-web-node-modules.tar.gz
View File

Binary file not shown.

506
A-Ops.spec
View File

@ -1,137 +1,27 @@
Name: A-Ops
Version: v1.1.1
Release: 6
Version: v1.3.0
Release: 3
Summary: The intelligent ops toolkit for openEuler
License: MulanPSL2
URL: https://gitee.com/openeuler/A-Ops
Source0: %{name}-%{version}.tar.gz
Source1: A-Ops-web-node-modules.tar.gz
Source2: vertical-left.png
Source3: horizontal-left.png
patch0001: 0001-fix-diag-return.patch
patch0002: 0002-fix-log-of-task-execution.patch
patch0003: 0003-add-permission-control-in-ragdoll.patch
patch0004: 0004-fix-logos-instructions-and-size.patch
patch0005: 0005-fix-the-python3-libselinux-dependency.patch
# build for gopher
BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel
BuildRequires: librdkafka-devel libmicrohttpd-devel
%global debug_package %{nil}
# build for ragdoll & aops basic module
BuildRequires: python3-setuptools python3-connexion python3-werkzeug python3-libyang
BuildRequires: git python3-devel systemd
# build for spider & aops basic module
# build for aops basic module
BuildRequires: python3-setuptools python3-kafka-python python3-connexion
# build for web
BuildRequires: nodejs node-gyp nodejs-yarn
%description
The intelligent ops toolkit for openEuler
%package -n aops-utils
Summary: utils for A-Ops
Requires: python3-concurrent-log-handler python3-xmltodict python3-pyyaml python3-marshmallow >= 3.13.0
Requires: python3-requests python3-xlrd python3-prettytable python3-pygments
%description -n aops-utils
utils for A-Ops
%package -n aops-cli
Summary: cli of A-ops
Requires: aops-utils = %{version}-%{release}
%description -n aops-cli
commandline tool of aops, offer commands for account management, host management,
host group management, task and template management of ansible.
%package -n aops-manager
Summary: manager of A-ops
Requires: aops-utils = %{version}-%{release} ansible >= 2.9.0
Requires: python3-pyyaml python3-marshmallow >= 3.13.0 python3-flask python3-flask-restful
Requires: python3-requests sshpass python3-uWSGI
%description -n aops-manager
manager of A-ops, support software deployment and installation, account management, host management,
host group management, task and template management of ansible.
%package -n aops-database
Summary: database center of A-ops
Requires: aops-utils = %{version}-%{release} python3-pyyaml
Requires: python3-elasticsearch >= 7 python3-requests python3-werkzeug python3-urllib3
Requires: python3-flask python3-flask-restful python3-PyMySQL python3-sqlalchemy
Requires: python3-prometheus-api-client python3-uWSGI
%description -n aops-database
database center of A-ops, offer database proxy of mysql, elasticsearch and prometheus time series database.
%package -n adoctor-check-scheduler
Summary: scheduler of A-ops check module
Requires: aops-utils = %{version}-%{release}
Requires: python3-requests python3-flask python3-flask-restful python3-uWSGI python3-kafka-python
Requires: python3-marshmallow >= 3.13.0 python3-Flask-APScheduler >= 1.11.0
%description -n adoctor-check-scheduler
Exception detection and scheduling service. Provides an exception detection interface to
manage exception detection tasks.
%package -n adoctor-check-executor
Summary: executor of A-ops check module
Requires: aops-utils = %{version}-%{release}
Requires: python3-kafka-python python3-pyyaml python3-marshmallow >= 3.13.0 python3-requests
Requires: python3-ply >= 3.11
%description -n adoctor-check-executor
Performs an exception task based on the configured exception detection rule.
%package -n adoctor-diag-scheduler
Summary: scheduler of A-ops diag module
Requires: aops-utils = %{version}-%{release}
Requires: python3-requests python3-flask python3-flask-restful python3-uWSGI python3-kafka-python
%description -n adoctor-diag-scheduler
Scheduler for diagnose module, provides restful interfaces to reply to requests about
importing/exporting diagnose tree, executing diagnose and so on.
%package -n adoctor-diag-executor
Summary: executor of A-ops check module
Requires: aops-utils = %{version}-%{release}
Requires: python3-kafka-python
%description -n adoctor-diag-executor
Executor of diagnose module. Get messages from kafka and do the diagnose tasks.
%package -n adoctor-cli
Summary: command line tool of A-doctor
Requires: aops-utils = %{version}-%{release}
Requires: python3-tqdm
%description -n adoctor-cli
commandline tool of adoctor, offer commands for executing diagnose, importing/exporting diagnose tree,
getting diagnose report, importing/exporting check rule, querying check result and so on.
%package -n gala-gopher
Summary: Intelligent ops toolkit for openEuler
Requires: bash glibc elfutils zlib iproute kernel >= 4.18.0-147.5.1.6 elfutils-devel
%description -n gala-gopher
Intelligent ops toolkit for openEuler
%package -n gala-ragdoll
Summary: Configuration traceability
Summary: Configuration traceability
Requires: python3-gala-ragdoll = %{version}-%{release}
%description -n gala-ragdoll
Configuration traceability
@ -139,187 +29,25 @@ Configuration traceability
%package -n python3-gala-ragdoll
Summary: python3 pakcage of gala-ragdoll
Requires: gala-ragdoll = %{version}-%{release} python3-flask-testing python3-libyang git
Requires: python3-flask-testing python3-libyang git
Requires: python3-werkzeug python3-connexion python3-swagger-ui-bundle
%description -n python3-gala-ragdoll
python3 pakcage of gala-ragdoll
%package -n gala-spider
Summary: Configuration traceability
%description -n gala-spider
Configuration traceability
%package -n python3-gala-spider
Summary: python3 pakcage of gala-spider
Requires: gala-spider = %{version}-%{release} python3-kafka-python python3-connexion
%description -n python3-gala-spider
python3 pakcage of gala-spider
%package -n aops-web
Summary: website for A-Ops
Requires: nginx
%description -n aops-web
website for A-Ops, deployed by Nginx
%define debug_package %{nil}
%prep
%setup
%setup -T -D -a 1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
cp -r A-Ops-web-node-modules/node_modules aops-web/
cp -f $RPM_SOURCE_DIR/vertical-left.png aops-web/src/assets/
cp -f $RPM_SOURCE_DIR/horizontal-left.png aops-web/src/assets/
%autosetup -n %{name}-%{version}
%build
# build for aops-utils
pushd aops-utils
%py3_build
popd
#build for aops-cli
pushd aops-cli
%py3_build
popd
#build for aops-manager
pushd aops-manager
%py3_build
popd
#build for aops-database
pushd aops-database
%py3_build
popd
#build for adoctor-check-scheduler
pushd adoctor-check-scheduler
%py3_build
popd
#build for adoctor-check-executor
pushd adoctor-check-executor
%py3_build
popd
#build for adoctor-diag-scheduler
pushd adoctor-diag-scheduler
%py3_build
popd
#build for adoctor-diag-executor
pushd adoctor-diag-executor
%py3_build
popd
#build for adoctor-cli
pushd adoctor-cli
%py3_build
popd
#build for gala-gopher
pushd gala-gopher
sh build.sh build
popd
#build for gala-ragdoll
pushd gala-ragdoll
%py3_build
popd
#build for gala-spider
pushd gala-spider
%py3_build
popd
#build for aops-web
pushd aops-web
yarn build
popd
%install
# install for utils
pushd aops-utils
%py3_install
popd
# install for cli
pushd aops-cli
%py3_install
popd
# install for manager
pushd aops-manager
%py3_install
mkdir -p %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/ansible_handler
cp -r aops_manager/deploy_manager/ansible_handler/* %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/ansible_handler
mkdir -p %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/tasks
cp -r aops_manager/deploy_manager/tasks/* %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/tasks
popd
# install for database
pushd aops-database
%py3_install
popd
# install for adoctor-check-scheduler
pushd adoctor-check-scheduler
%py3_install
popd
# install for adoctor-check-executor
pushd adoctor-check-executor
%py3_install
popd
# install for adoctor-diag-scheduler
pushd adoctor-diag-scheduler
%py3_install
popd
# install for adoctor-diag-executor
pushd adoctor-diag-executor
%py3_install
popd
# install for adoctor-cli
pushd adoctor-cli
%py3_install
popd
# install for web
pushd aops-web
mkdir -p %{buildroot}/opt/aops_web
cp -r dist %{buildroot}/opt/aops_web/
mkdir -p %{buildroot}/%{_sysconfdir}/nginx
cp -r deploy/aops-nginx.conf %{buildroot}/%{_sysconfdir}/nginx/
mkdir -p %{buildroot}/usr/lib/systemd/system
cp -r deploy/aops-web.service %{buildroot}/usr/lib/systemd/system/
popd
#install for gala-gopher
pushd gala-gopher
install -d %{buildroot}/opt/gala-gopher
install -d %{buildroot}%{_bindir}
mkdir -p %{buildroot}/usr/lib/systemd/system
install -m 0600 service/gala-gopher.service %{buildroot}/usr/lib/systemd/system/gala-gopher.service
sh install.sh %{buildroot}%{_bindir} %{buildroot}/opt/gala-gopher
popd
#install for gala-ragdoll
pushd gala-ragdoll
%py3_install
@ -332,139 +60,21 @@ mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system
install service/gala-ragdoll.service %{buildroot}/%{_prefix}/lib/systemd/system
popd
#install for gala-spider
pushd gala-spider
%py3_install
mkdir -p %{buildroot}/%{_sysconfdir}/spider
install config/*.conf %{buildroot}/%{_sysconfdir}/spider/
mkdir %{buildroot}/%{python3_sitelib}/spider/config
install config/*.conf %{buildroot}/%{python3_sitelib}/spider/config
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system
install service/gala-spider.service %{buildroot}/%{_prefix}/lib/systemd/system
mkdir -p %{buildroot}/%{_tmppath}/spider
popd
%post -n gala-gopher
%systemd_post gala-gopher.service
%preun -n gala-gopher
%systemd_preun gala-gopher.service
%postun -n gala-gopher
%systemd_postun_with_restart gala-gopher.service
%pre -n python3-gala-ragdoll
%pre -n gala-ragdoll
if [ -f "%{systemd_dir}/gala-ragdoll.service" ] ; then
systemctl enable gala-ragdoll.service || :
fi
%post -n python3-gala-ragdoll
%post -n gala-ragdoll
%systemd_post gala-ragdoll.service
%preun -n python3-gala-ragdoll
%preun -n gala-ragdoll
%systemd_preun gala-ragdoll.service
%postun -n python3-gala-ragdoll
%postun -n gala-ragdoll
%systemd_postun gala-ragdoll.service
%pre -n python3-gala-spider
if [ -f "%{systemd_dir}/gala-spider.service" ] ; then
systemctl enable gala-spider.service || :
fi
%post -n python3-gala-spider
%systemd_post gala-spider.service
%preun -n python3-gala-spider
%systemd_preun gala-spider.service
%postun -n python3-gala-spider
%systemd_postun gala-spider.service
%files -n aops-utils
%doc README.*
%attr(0644,root,root) %{_sysconfdir}/aops/system.ini
%{python3_sitelib}/aops_utils*.egg-info
%{python3_sitelib}/aops_utils/*
%attr(0755,root,root) %{_bindir}/aops-utils
%files -n aops-cli
%attr(0755,root,root) %{_bindir}/aops
%{python3_sitelib}/aops_cli*.egg-info
%{python3_sitelib}/aops_cli/*
%files -n aops-manager
%attr(0644,root,root) %{_sysconfdir}/aops/manager.ini
%attr(0755,root,root) %{_bindir}/aops-manager
%attr(0755,root,root) %{_unitdir}/aops-manager.service
%{python3_sitelib}/aops_manager*.egg-info
%{python3_sitelib}/aops_manager/*
%files -n aops-database
%attr(0644,root,root) %{_sysconfdir}/aops/database.ini
%attr(0644,root,root) %{_sysconfdir}/aops/default.json
%attr(0755,root,root) %{_unitdir}/aops-database.service
%attr(0755,root,root) %{_bindir}/aops-database
%attr(0755,root,root) %{_bindir}/aops-basedatabase
%{python3_sitelib}/aops_database*.egg-info
%{python3_sitelib}/aops_database/*
%files -n adoctor-check-scheduler
%attr(0644,root,root) %{_sysconfdir}/aops/check_scheduler.ini
%attr(0755,root,root) %{_unitdir}/adoctor-check-scheduler.service
%attr(0755,root,root) %{_bindir}/adoctor-check-scheduler
%{python3_sitelib}/adoctor_check_scheduler*.egg-info
%{python3_sitelib}/adoctor_check_scheduler/*
%files -n adoctor-check-executor
%attr(0644,root,root) %{_sysconfdir}/aops/check_executor.ini
%attr(0644,root,root) %{_sysconfdir}/aops/check_rule_plugin.yml
%attr(0755,root,root) %{_unitdir}/adoctor-check-executor.service
%attr(0755,root,root) %{_bindir}/adoctor-check-executor
%{python3_sitelib}/adoctor_check_executor*.egg-info
%{python3_sitelib}/adoctor_check_executor/*
%files -n adoctor-diag-scheduler
%attr(0644,root,root) %{_sysconfdir}/aops/diag_scheduler.ini
%attr(0755,root,root) %{_unitdir}/adoctor-diag-scheduler.service
%attr(0755,root,root) %{_bindir}/adoctor-diag-scheduler
%{python3_sitelib}/adoctor_diag_scheduler*.egg-info
%{python3_sitelib}/adoctor_diag_scheduler/*
%files -n adoctor-diag-executor
%attr(0644,root,root) %{_sysconfdir}/aops/diag_executor.ini
%attr(0755,root,root) %{_unitdir}/adoctor-diag-executor.service
%attr(0755,root,root) %{_bindir}/adoctor-diag-executor
%{python3_sitelib}/adoctor_diag_executor*.egg-info
%{python3_sitelib}/adoctor_diag_executor/*
%files -n adoctor-cli
%attr(0755,root,root) %{_bindir}/adoctor
%{python3_sitelib}/adoctor_cli*.egg-info
%{python3_sitelib}/adoctor_cli/*
%files -n gala-gopher
%defattr(-,root,root)
%dir /opt/gala-gopher
%dir /opt/gala-gopher/extend_probes
%dir /opt/gala-gopher/meta
%{_bindir}/gala-gopher
%config(noreplace) /opt/gala-gopher/gala-gopher.conf
/opt/gala-gopher/extend_probes/*
/opt/gala-gopher/meta/*
/usr/lib/systemd/system/gala-gopher.service
%files -n gala-ragdoll
%doc gala-ragdoll/doc/*
@ -480,29 +90,75 @@ fi
%{python3_sitelib}/ragdoll-*.egg-info
%files -n gala-spider
%doc gala-spider/doc/*
%license gala-spider/LICENSE
/%{_sysconfdir}/spider/gala-spider.conf
%{_bindir}/spider
%{_prefix}/lib/systemd/system/gala-spider.service
%dir %{_tmppath}/spider
%files -n python3-gala-spider
%{python3_sitelib}/spider/*
%{python3_sitelib}/spider-*.egg-info
%files -n aops-web
%attr(0755, root, root) /opt/aops_web/dist/*
%attr(0755, root, root) %{_sysconfdir}/nginx/aops-nginx.conf
%attr(0755, root, root) %{_unitdir}/aops-web.service
%changelog
* Tue Feb 22 2022 chemingdao<chemingdao@huawei.com> - v1.1.1-6
- fix the python3-libselinux dependency.
* Mon Apr 17 2023 wenxin<shusheng.wen@outlook.com> - v1.3.0-3
- update the host id validate method for ragdoll
* Tue Feb 28 2023 zhuyuncheng<zhuyuncheng@huawei.com> - v1.3.0-2
- remove packages which have moved to new repositories.
* Mon Sep 26 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.3.0-1
- update delete host return message
- update add domain return message
* Wed Sep 14 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.6-1
- move aops-basedatabase to aops-tools
- rename default scene from 'unknown' to 'normal'
* Tue Sep 13 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.5-4
- bug fix: start gala-ragdoll.service when install gala-ragdoll.
* Fri Sep 9 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.5-3
- bug fix: add create time attribute of workflow, fix assign model bug of aops-check default mode
- update agent get host info interface and some test cases
- fix gala-ragdoll return code issue
- web fine-tuning for workflow and agent info.
* Wed Sep 7 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.5-2
- bug fix: adjust dependent packages for gala-ragdoll.
* Tue Sep 6 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.5-1
- bug fix: bugfix of aops-web and aops-check's interaction
* Fri Sep 2 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.4-1
- add default mode of aops-check, which can run independently.
* Mon Aug 29 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.3-3
- bug fix: gala-spider adapt to abnormal event format change.
* Mon Aug 29 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.3-2
- bug fix: bugfix for gopher report metadata to kafka.
* Sat Aug 27 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.3-1
- Add requires of aops-check for new features.
* Tue Aug 23 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.2-2
- Set user modification of confs will not be overwrite for gala_spider.
* Wed Aug 10 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.2-1
- New release 1.2.2, bug fix and add new module.
- add missed requirement python3-PyMySQL
- add new module, check and web
* Wed Aug 10 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.1-1
- New release 1.2.1, bug fix.
- modify patch for gala-gopher and rm patch for gala-anteater.
- reduce the operating noise of gala-gopher.
- optimize the module of gala-anteater.
* Tue Aug 2 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.0-3
- 1. add patch to modify install_requires of gala-anteater.
- 2. delete redundant dependent packages for gala-spider.
* Mon Aug 1 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.2.0-2
- add base-database executable file into aops-manager to downlaod database.
* Sun Jul 31 2022 zhaoyuxing<zhaoyuxing2@huawei.com> - v1.2.0-1
- modify spec for gala-gopher&gala-spider and add new features.
- 1. gala-gopher & gala-spider adapt to the latest code.
- 2. add new feature gala-anteater.
- add aops-agent module, delete aops-database, aops-cli, aops-web,
and four adoctor modules for new architecture.
* Thu Sep 30 2021 chemingdao<chemingdao@huawei.com> - v1.1.1-5
- Using image source overwrite instead of patching image binaries.

BIN
horizontal-left.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
vertical-left.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB