Merge pull request #8174 from yousong/automated-cherry-pick-of-#8173-upstream-release-3.4

Automated cherry pick of #8173: dns: isMyDomain: match only strict subdomain of dns_domain

.circleci/config.yml

@@ -5,10 +5,10 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunionio/centos-build:1.0-1
         environment:
           ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunionio/centos-build:1.0-1
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -26,7 +26,7 @@ jobs:
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /root/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
     parallelism: 4
     steps:
       - checkout
@@ -38,7 +38,7 @@ jobs:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make -j2 $targets
+            make -j3 $targets
             ls -lh _output/bin/
       - save_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
@@ -51,10 +51,10 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunionio/centos-build:1.0-1
         environment:
-          ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/src/yunion.io/x/onecloud
+          GO111MODULE: "on"
+    working_directory: /root/go/onecloud
     parallelism: 4
     steps:
       - checkout

.dockerignore

@@ -1,7 +0,0 @@
- _output/alpine-build/_cache
-pkg
-vendor
-cmd
-locales
-docs
-scripts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,6 +18,4 @@ assignees: ''
 **Environment**:
 - OS (e.g: `cat /etc/os-release`):
 - Kernel (e.g. `uname -a`):
-<!--
-- Version (e.g. `climc version-list`):
--->
+- Others:

.gitignore

@@ -31,7 +31,6 @@ _output
 /structargtest
 .idea
 .vscode
-intellij.yaml
 GPATH
 GRTAGS
 GTAGS

Makefile

@@ -6,11 +6,10 @@ ROOT_DIR := $(CURDIR)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
-DEB_BUILD_SCRIPT := $(ROOT_DIR)/build/build_deb.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
-	GIT_BRANCH := $(shell git branch -r --contains | head -1 | sed -E -e "s%(HEAD ->|origin|upstream)/?%%g" | xargs)
+	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
 	GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
 	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
 	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -65,7 +64,6 @@ endif
 
 cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
 rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
-debTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),deb/$(b)))
 
 all: build
 
@@ -89,45 +87,21 @@ vet:
 cmd/esxi-agent: prepare_dir
 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
-cmd/fetcherfs: prepare_dir
-	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
-
 cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
 rpm/%: cmd/%
 	$(BUILD_SCRIPT) $*
 
-deb/%: cmd/%
-	$(DEB_BUILD_SCRIPT) $*
-
 pkg/%: prepare_dir
 	$(GO_INSTALL) $(REPO_PREFIX)/$@
 
-rpm/fetcherfs: cmd/fetcherfs
-	docker run --rm \
-		--name docker-centos-build-fetcherfs \
-		-v $(CURDIR):/data \
-		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 \
-		/bin/bash -c "VERSION=3.6 /data/build/build.sh fetcherfs /opt/yunion/fetchclient/bin"
-
-deb/fetcherfs: rpm/fetcherfs
-	#VERSION=3.6 $(DEB_BUILD_SCRIPT) fetcherfs /opt/yunion/fetchclient/bin
-	docker run --rm \
-		--name docker-debian-build-fetcherfs \
-		-v $(CURDIR):/data \
-		registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 \
-		/data/build/convert_rpm2deb.sh
-
 build:
 	$(MAKE) $(cmdTargets)
 
 rpm:
 	$(MAKE) $(rpmTargets)
 
-deb:
-	$(MAKE) $(debTargets)
-
 rpmclean:
 	rm -fr $(BUILD_DIR)/rpms
 
@@ -152,11 +126,6 @@ clean:
 fmt:
 	@git ls-files --exclude '*' '*.go' \
 		| grep -v '^vendor/' \
-		| while read f; do \
-			if ! grep -m1 -q '^// Code generated .* DO NOT EDIT\.$$' "$$f"; then \
-				echo "$$f"; \
-			fi ; \
-		done \
 		| xargs $(XARGS_FLAGS) gofmt -w
 
 fmt-check: fmt
@@ -199,53 +168,10 @@ vet-check:
 	./scripts/vet.sh chk
 .PHONY: vet-check
 
-comma:=,
-space:=$(space) $(space)
-# NOTE: keep y18n-packages in alphabetical order
-y18n-src-lang := en-US
-y18n-lang     := en-US,zh-CN
-y18n-packages := \
-		yunion.io/x/onecloud/cmd/apigateway \
-		yunion.io/x/onecloud/cmd/keystone \
-		yunion.io/x/onecloud/cmd/monitor \
-		yunion.io/x/onecloud/cmd/region \
-		yunion.io/x/onecloud/cmd/yunionconf \
-
-define y18n-gen
-	set -o errexit; \
-	set -o pipefail; \
-	export GO111MODULE=off; \
-	y18n \
-		-chdir $(CURDIR) \
-		-dir ./locales/ \
-		-out ./locales/locales.go \
-		-lang $(y18n-lang) \
-		$(y18n-packages) \
-		; \
-	$(foreach lang,$(filter-out $(y18n-src-lang),$(subst $(comma), ,$(y18n-lang))),cp ./locales/$(lang)/{out,messages}.gotext.json;) \
-
-endef
-
-y18n-gen:
-	$(y18n-gen)
-	$(y18n-gen)
-
-.PHONY: y18n-gen
-
-y18n-check:
-	$(y18n-gen)
-	if git status --short ./locales | sed 's/^/$@: /' | grep .; then \
-		echo "$@: Locales content needs care" >&2 ; \
-		false; \
-	fi
-
-.PHONY: y18n-check
-
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
 check: vet-check
-#check: y18n-check
 .PHONY: check
 
 
@@ -272,6 +198,70 @@ mod:
 	go mod tidy
 	go mod vendor -v
 
+
+DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-1
+
+define dockerCentOSBuildCmd
+set -o xtrace
+set -o errexit
+set -o pipefail
+cd /root/onecloud
+export GOFLAGS=-mod=vendor
+make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
+endef
+
+docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
+docker-centos-build:
+	docker rm --force onecloud-ci-build &>/dev/null || true
+	docker run \
+		--name onecloud-docker-centos-build \
+		--rm \
+		--volume $(CURDIR):/root/onecloud \
+		--volume $(CURDIR)/_output/_cache:/root/.cache \
+		$(DOCKER_CENTOS_BUILD_IMAGE) \
+		/bin/bash -c "$$dockerCentOSBuildCmd"
+	chown -R $$(id -u):$$(id -g) _output
+	ls -lh _output/bin
+
+# NOTE we need a way to stop and remove the container started by docker-build.
+# No --tty, --stop-signal won't work
+docker-centos-build-stop:
+	docker stop --time 0 onecloud-docker-centos-build || true
+
+.PHONY: docker-centos-build
+.PHONY: docker-centos-build-stop
+
+DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3
+
+define dockerAlpineBuildCmd
+set -o xtrace
+set -o errexit
+set -o pipefail
+cd /root/go/src/yunion.io/x/onecloud
+export GOFLAGS=-mod=vendor
+make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
+endef
+
+docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
+docker-alpine-build:
+	docker rm --force onecloud-docker-alpine-build &>/dev/null || true
+	docker run --rm \
+		--name onecloud-docker-alpine-build \
+		-v $(CURDIR):/root/go/src/yunion.io/x/onecloud \
+		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
+		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
+		$(DOCKER_ALPINE_BUILD_IMAGE) \
+		/bin/sh -c "$$dockerAlpineBuildCmd"
+	ls -lh _output/alpine-build/bin
+
+docker-alpine-build-stop:
+	docker stop --time 0 onecloud-docker-alpine-build || true
+
+.PHONY: docker-alpine-build
+.PHONY: docker-alpine-build-stop
+
 define helpText
 Build with docker
 
@@ -324,16 +314,9 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
                 git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
 
 image:
-	mkdir -p $(ROOT_DIR)/_output
 	DEBUG=$(DEBUG) ARCH=$(ARCH) TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: image
 
-image-telegraf-raid-plugin:
-	VERSION=release-1.6.1 ARCH=all make image telegraf-raid-plugin
-
 %:
 	@:
-
-ModName:=yunion.io/x/onecloud
-include $(CURDIR)/Makefile.common.mk

Makefile.common.mk

@@ -1,83 +0,0 @@
-ifeq ($(__inc_Makefile_common_mk),)
-__inc_Makefile_common_mk:=1
-
-ifeq ($(ModName),)
-  $(error ModName must be set, e.g. yunion.io/x/onecloud)
-endif
-ModBaseName:=$(notdir $(ModName))
-
-DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-5
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-5
-
-
-EnvIf=$(if $($(1)),$(1)=$($(1)))
-
-define dockerCentOSBuildCmd
-set -o xtrace
-set -o errexit
-set -o pipefail
-cd /root/go/src/yunion.io/x/$(ModBaseName)
-env \
-	$(call EnvIf,GOARCH) \
-	$(call EnvIf,GOOS) \
-	$(call EnvIf,CGO_ENABLED) \
-	make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
-endef
-
-docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
-docker-centos-build:
-	docker rm --force docker-centos-build-$(ModBaseName) &>/dev/null || true
-	docker run \
-		--rm \
-		--name docker-centos-build-$(ModBaseName) \
-		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
-		-v $(CURDIR)/_output/centos-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
-		-v $(CURDIR)/_output/centos-build/_cache:/root/.cache \
-		$(DockerImageCentOSBuild) \
-		/bin/bash -c "$$dockerCentOSBuildCmd"
-	ls -lh _output/centos-build/bin
-
-# NOTE we need a way to stop and remove the container started by docker-build.
-# No --tty, --stop-signal won't work
-docker-centos-build-stop:
-	docker stop --time 0 docker-centos-build-$(ModBaseName) || true
-
-.PHONY: docker-centos-build
-.PHONY: docker-centos-build-stop
-
-
-define dockerAlpineBuildCmd
-set -o xtrace
-set -o errexit
-set -o pipefail
-cd /root/go/src/yunion.io/x/$(ModBaseName)
-env \
-	$(call EnvIf,GOARCH) \
-	$(call EnvIf,GOOS) \
-	$(call EnvIf,CGO_ENABLED) \
-	make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
-endef
-
-docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
-docker-alpine-build:
-	docker rm --force docker-alpine-build-$(ModBaseName) &>/dev/null || true
-	docker run \
-		--rm \
-		--name docker-alpine-build-$(ModBaseName) \
-		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
-		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
-		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
-		$(DockerImageAlpineBuild) \
-		/bin/sh -c "$$dockerAlpineBuildCmd"
-	ls -lh _output/alpine-build/bin
-
-docker-alpine-build-stop:
-	docker stop --time 0 docker-alpine-build-$(ModBaseName) || true
-
-.PHONY: docker-alpine-build
-.PHONY: docker-alpine-build-stop
-
-endif # __inc_Makefile_common_mk

OWNERS

@@ -4,6 +4,12 @@ reviewers:
   - ioito
   - swordqiu
   - tb365
+  - wanyaoqi
+  - yousong
+  - zhaoxiangchun
+  - zhasm
 approvers:
   - swordqiu
+  - yousong
+  - wanyaoqi
   - Zexi

README-CN.md

@@ -1,12 +1,12 @@
-# Yunion Cloud (云联融合云）
+# Yunion OneCloud (云联融合云）
 
-[![CircleCI](https://circleci.com/gh/yunionio/yunioncloud.svg?style=svg)](https://circleci.com/gh/yunionio/yunioncloud) 
-[![Build Status](https://travis-ci.com/yunionio/yunioncloud.svg?branch=master)](https://travis-ci.org/yunionio/yunioncloud) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/yunioncloud)](https://goreportcard.com/report/github.com/yunionio/yunioncloud) 
+[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
 
 ## 什么是云联融合云?
 
-云联融合云（Yunion Cloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
+云联融合云（Yunion OneCloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
 
 鉴于企业IT基础设施的两个趋势：1. 企业使用多云基础设施，并且公有云是最主要的基础设施提供者；2. 企业应用将逐步云原生化，企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施，另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
 
@@ -18,18 +18,18 @@
 
 - 内置私有云
 
-  YunionCloud 内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
+  OneCloud内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
 
 - 为多云Kubernetes提供运行环境
 
-  YunionCloud 自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
+  OneCloud自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
 
 欢迎安装部署云联融合云，期待大家的反馈！
 
 
 ## 部署
 
-请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 YunionCloud 集群。
+请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 OneCloud 集群。
 
 
 ## 文档
@@ -41,7 +41,7 @@
 
 ## 架构
 
-![architecture](https://www.yunion.cn/static/frame.png)
+![architecture](./docs/architecture.svg)
 
 
 ## 贡献
@@ -51,4 +51,4 @@
 
 ## License
 
-YunionCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。
+OneCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。

README.md

@@ -1,22 +1,22 @@
-# Yunion Cloud
+# Yunion OneCloud
 
-[![CircleCI](https://circleci.com/gh/yunionio/yunioncloud.svg?style=svg)](https://circleci.com/gh/yunionio/yunioncloud) 
-[![Build Status](https://travis-ci.com/yunionio/yunioncloud.svg?branch=master)](https://travis-ci.com/yunionio/yunioncloud/branches) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/yunioncloud)](https://goreportcard.com/report/github.com/yunionio/yunioncloud) 
+[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.com/yunionio/onecloud/branches) 
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
 
 ### [README in Chinese](./README-CN.md)
 
-## What is Yunion Cloud?
+## What is Yunion OneCloud?
 
-Yunion Cloud is an open source unified-IaaS cloud platform.
+Yunion OneCloud is an open source unified-IaaS cloud platform.
 
-As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion Cloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
+As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion OneCloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
 
-As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion Cloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
+As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion OneCloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
 
-Many may consider Yunion Cloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
+Many may consider Yunion OneCloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
 
-Yunion Cloud is working on abstracting APIs for the following resources:
+Yunion OneCloud is working on abstracting APIs for the following resources:
 
 * Compute, including virtual machines, images, etc.
 * Storage, including disks, snapshots, object storages, etc.
@@ -30,7 +30,7 @@ over the following many cloud providers:
 * Private clouds, including OpenStack, etc.
 * Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
 
-You are welcome to install and try Yunion Cloud. Looking forward to your feedback.
+You are welcome to install and try Yunion OneCloud. Looking forward to your feedback.
 
 ## Installation
 
@@ -38,13 +38,13 @@ Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (cur
 
 ## Documentations
 
-- [Yunion Cloud Documents](https://docs.yunion.io/)
+- [Yunion OneCloud Documents](https://docs.yunion.io/)
 
 - [Swagger API](https://docs.yunion.cn/apiv2/)
 
 ## Architecture
 
-![architecture](https://www.yunion.cn/static/frame.png)
+![architecture](./docs/architecture.svg)
 
 ## Contribution
 

build/build_deb.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$ROOT_DIR" ]; then
-	pushd $(dirname $(readlink -f "$BASH_SOURCE")) > /dev/null
-	ROOT_DIR=$(cd .. && pwd)
-	popd > /dev/null
-fi
-
-SRC_BIN=$ROOT_DIR/_output/bin
-SRC_BUILD=$ROOT_DIR/build
-OUTPUT_DIR=$ROOT_DIR/_output/debs
-
-PKG=$1
-BIN_PATH=${2:-/opt/yunion/bin}
-
-if [ -z "$PKG" ]; then
-    echo "Usage: $0 <package>"
-    exit 1
-fi
-
-BIN="$SRC_BIN/$PKG"
-ROOT="$SRC_BUILD/$PKG"
-
-if [ ! -x "$BIN" ]; then
-    echo "$BIN not exists"
-    exit 1
-fi
-
-if [ ! -x "$ROOT" ]; then
-    echo "$ROOT not exists"
-    exit 1
-fi
-
-. $ROOT/vars
-
-if [ -z "$VERSION" ]; then
-    TAG=$(git describe --abbrev=0 --tags || echo 000000)
-    VERSION=${TAG/\//-}
-    VERSION=${VERSION/v/}
-fi
-RELEASE=`date +"%y%m%d%H"`
-FULL_VERSION=$VERSION-$RELEASE
-BUILDROOT=$OUTPUT_DIR/yunion-$1-$FULL_VERSION
-rm -rf $BUILDROOT
-mkdir -p $BUILDROOT/DEBIAN
-mkdir -p $BUILDROOT/$BIN_PATH
-
-cp -rf $BIN $BUILDROOT/$BIN_PATH
-cp -rf $ROOT/root/* $BUILDROOT/
-
-
-echo "Build root ${BUILDROOT}"
-
-case $(uname -m) in
-    x86_64)
-        CURRENT_ARCH=amd64
-        ;;
-    aarch64)
-        CURRENT_ARCH=arm64
-        ;;
-esac
-
-echo "Package: yunion-$1
-Version: $FULL_VERSION
-Section: base
-Priority: optional
-Architecture: $CURRENT_ARCH
-Maintainer: wanyaoqi@yunionyun.com
-Description: Yunion $1
-" > $BUILDROOT/DEBIAN/control
-chmod 0755 $BUILDROOT/DEBIAN/control
-
-
-dpkg-deb --build $BUILDROOT

build/climc/root/opt/yunion/scripts/motd/climc.sh

@@ -1,3 +0,0 @@
-echo "Welcome to Cloud Shell :-) You may execute climc and other command tools in this shell."
-echo "Please exec 'climc' to get started"
-echo ""

build/climc/root/opt/yunion/scripts/rbac/domainadmin.yaml

@@ -0,0 +1,6 @@
+# rbac for project owner, not allow for delete
+roles:
+  - domain_admin
+scope: domain
+policy:
+  '*': allow

build/climc/root/opt/yunion/scripts/rbac/member.yaml

@@ -1,10 +1,9 @@
+# rbac for normal user, not allow for delete
+scope: project
 policy:
   '*':
     '*':
       '*': allow
       create: deny
+      update: deny
       delete: deny
-      perform:
-        purge: deny
-        clone: deny
-        '*': allow

build/climc/root/opt/yunion/scripts/rbac/owner.yaml

@@ -1,2 +0,0 @@
-policy:
-  '*': allow

build/climc/root/opt/yunion/scripts/rbac/projectowner.yaml

@@ -0,0 +1,6 @@
+# rbac for project owner, not allow for delete
+roles:
+  - project_owner
+scope: project
+policy:
+  '*': allow

build/climc/root/opt/yunion/scripts/rbac/sysadmin.yaml

@@ -0,0 +1,8 @@
+# rbac for sysadmin
+projects:
+  - system
+roles:
+  - admin
+scope: system
+policy:
+  '*': allow

build/climc/root/opt/yunion/scripts/rbac/viewer.yaml

@@ -1,6 +0,0 @@
-policy:
-  '*':
-    '*':
-      get: allow
-      list: allow
-      '*': deny

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/content@cn/CLOUD_USER_CREATED

@@ -1,6 +0,0 @@
-公有云子账号创建成功
-主账号：{{ .account }}<br>
-名称：{{ .name }}<br>
-密码：{{ .password }}<br>
-登录地址: {{ .iam_login_url }}<br>
-资源ID: {{ .id }}<br>

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/content@en/CLOUD_USER_CREATED

@@ -1,6 +0,0 @@
-Clouduser has been created successfully
-Root Account: {{ .account }}<br>
-Name：{{ .name }}<br>
-Password：{{ .password }}<br>
-IAM Login URL: {{ .iam_login_url }}<br>
-Resource ID: {{ .id }}<br>

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/title@cn/CLOUD_USER_CREATED

@@ -1 +0,0 @@
-公有云子账号 {{ .name }} 创建成功

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/title@en/CLOUD_USER_CREATED

@@ -1 +0,0 @@
-The clouduser {{ .name }} created successfully

build/cloudid/root/opt/yunion/share/saml/sp-metadata/azure.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" ID="_1e55eaf7-5cb9-4601-b557-e322fdfb2baf" entityID="urn:federation:MicrosoftOnline">
-  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-    <SignedInfo>
-      <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <Reference URI="#_1e55eaf7-5cb9-4601-b557-e322fdfb2baf">
-        <Transforms>
-          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-        </Transforms>
-        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <DigestValue>fA33hUaj24/8F8bArDIkH6CpX0k=</DigestValue>
-      </Reference>
-    </SignedInfo>
-    <SignatureValue>p/rlVWxLRIYiHozzWUgsjmQ5ItMZ/ITeEOg/edeo50l7qU8wLM9JD55EHoLpVvxImBcCfY1CxKdq3s1o9Up1jvEcH9KjfYZea1q8hzTkQdt7F2XvxoqDFRLvVwyHHJjygaEvFRXXxml7IDgDx9ScSRhQeGUlTGhI9eAFSaGkChM/FPnmekZ3ngSwbVf4FsTLIArxMqEnV0lXNMTr5NHQ6VL5wZ/cHLNCkkBoY0qWyv2hnYiZiXa4TKjpAN+8QF5GDPv/0ExJwe+aoRAQhdBzhBUICQdQd+v3Rb5SuX++iVfmf4IPMqj8CK4uK7iYXNLCGEO8oFR2KlK/zBpHzw6yCQ==</SignatureValue>
-    <KeyInfo>
-      <X509Data>
-        <X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
-      </X509Data>
-    </KeyInfo>
-  </Signature>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.microsoftonline.com/login.srf" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.microsoftonline.com/login.srf" index="2"/>
-  </SPSSODescriptor>
-  <Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-  </Extensions>
-</EntityDescriptor>

build/convert_rpm2deb.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z "$ROOT_DIR" ]; then
-    ROOT_DIR=$(dirname $(dirname $(readlink -f "$BASH_SOURCE")))
-fi
-
-RPMS_DIR=$ROOT_DIR/_output/rpms
-DEBS_DIR=$ROOT_DIR/_output/debs
-
-case $(uname -m) in
-    x86_64)
-        CURRENT_ARCH=amd64
-        ;;
-    aarch64)
-        CURRENT_ARCH=arm64
-        ;;
-esac
-
-mkdir -p $DEBS_DIR && cd $DEBS_DIR
-
-find $RPMS_DIR -type f -name *.rpm -exec alien --target=$CURRENT_ARCH {} \;

build/dhcprelay/root/etc/sysconfig/yunion_dhcprelay

@@ -1,3 +0,0 @@
-INTERFACE=""
-INTERFACE_IP=""
-RELAY=""

build/dhcprelay/root/usr/lib/systemd/system/yunion-dhcprelay.service

@@ -1,22 +0,0 @@
-[Unit]
-Description=Yunion Cloud DHCP Relay Agent
-Documentation=https://docs.yunion.cn
-After=network-online.target
-Wants=network-online.target
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/yunion_dhcprelay
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/dhcprelay --interface "$INTERFACE" --ip "$IP" --relay "$RELAY"
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/dhcprelay/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Tiny DHCP Relay Server"
-SERVICE="yes"

build/docker/Dockerfile.ansibleserver

@@ -1,7 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5
-
-# install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.3 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.3 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.2
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
@@ -7,7 +7,6 @@ MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 RUN set -x \
 	&& apk update \
 	&& apk add openssh-client \
-	&& apk add sshpass \
 	&& apk add ansible \
 	&& apk add tzdata git ca-certificates \
 	&& rm -rf /var/cache/apk/*

build/docker/Dockerfile.apigateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway
+ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway

build/docker/Dockerfile.baremetal-agent

@@ -1,11 +1,9 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.2
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
-#ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
-#ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
-#ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent
-RUN apk add librados librbd
-ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
+ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
+ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
+ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent

build/docker/Dockerfile.baremetal-base

@@ -1,8 +1,4 @@
-FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
-RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21080303.x86_64.rpm
-#RUN yum install -y http://192.168.122.112:8083/baremetal-pxerom-1.1.0-21080303.x86_64.rpm
-
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM frolvlad/alpine-glibc:glibc-2.28
 
 MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
@@ -20,17 +16,17 @@ RUN mkdir -p /opt/cloud/yunion/baremetal
 RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
 
 # download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
-COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
-COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
-COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
-COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal

build/docker/Dockerfile.climc

@@ -1,7 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20200820
 
 ADD ./build/climc/root/opt /opt
 
-RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc
-
 ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
@@ -6,9 +6,7 @@ ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 
-RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
-
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool kubectl ceph-common && \
+RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.cloudevent

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent
+ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudid

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/cloudid/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

build/docker/Dockerfile.cloudmon

@@ -1,8 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /etc/yunion/data/
-
-ADD   ./_output/alpine-build/bin/cloudmon \
-      /opt/yunion/bin/

build/docker/Dockerfile.cloudnet

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet
+ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet

build/docker/Dockerfile.cloudproxy

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
-
-ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy

build/docker/Dockerfile.debian-base

@@ -1,9 +0,0 @@
-# registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0
-
-FROM debian:10
-
-RUN apt update && apt install -y alien
-
-RUN apt-get clean autoclean && \
-	apt-get autoremove --yes && \
-	rm -rf /var/lib/{apt,dpkg,cache,log}/

build/docker/Dockerfile.devtool

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool
+ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool

build/docker/Dockerfile.esxi-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/esxi-agent/root/opt/ /opt/
 

build/docker/Dockerfile.file-repo

@@ -1,21 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
-
-MAINTAINER "Rain Zheng <zhengyu@yunion.com>"
-
-# openssh-client, for ansible ssh connection
-# git, ca-certificates, for fetching ansible roles
-RUN set -x \
-	&& apk update \
-	&& apk add git \
-	&& rm -rf /var/cache/apk/*
-
-# install default playbook and install pkg
-Run mkdir -p /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_amd64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_arm64.deb -P /opt/yunion/ansible-install-pkg
-
-Run mkdir -p /opt/yunion/playbook
-Run mkdir /opt/yunion/playbook/monitor-agent
-Run git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules

build/docker/Dockerfile.glance

@@ -1,7 +1,6 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20200820
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
 RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance
+ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Dockerfile.host-deployer

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:0.6
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.4
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
@@ -6,4 +6,4 @@ ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 
-ADD ./_output/centos-build/bin/host-deployer /opt/yunion/bin/host-deployer
+ADD ./_output/alpine-build/bin/host-deployer /opt/yunion/bin/host-deployer

build/docker/Dockerfile.keystone

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone
+ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone

build/docker/Dockerfile.logger

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger

build/docker/Dockerfile.monitor

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/monitor/root/opt/ /opt/
-ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor
+ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor

build/docker/Dockerfile.notify

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/notify/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify

build/docker/Dockerfile.onecloud-base

@@ -1,5 +1,4 @@
-# TODO: use 3.14 will lead 'apk add qemu-img fail on arm64'
-FROM alpine:3.13.5
+FROM alpine:3.11
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.region

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/region/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region

build/docker/Dockerfile.region-dns

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway
+ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway

build/docker/Dockerfile.scheduler

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler
+ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler

build/docker/Dockerfile.telegraf-raid-plugin

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.0
-
-ADD ./_output/centos-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

build/docker/Dockerfile.torrent

@@ -1,15 +1,15 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
-
-# HACK: use v3.14 alpine mirror to upgrade qemu-img
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN apk update && \
-    apk add --no-cache qemu-img && \
+    apk add --no-cache tzdata ca-certificates qemu-img && \
     rm -rf /var/cache/apk/*
 
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+ENV TZ Asia/Shanghai
+
 # add executable file torrent
 # make cmd/torrent
 RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.vpcagent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-1
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 

build/docker/Dockerfile.yunionconf

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf

build/docker/Makefile

@@ -1,35 +0,0 @@
-REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
-DOCKER_BUILD = docker build -t $(REGISTRY)
-DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
-
-
-debian10-base:
-	docker buildx build --platform linux/arm64,linux/amd64 --push \
-		-t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base .
-
-ONECLOUD_BASE_VERSION = v0.3.5
-
-onecloud-base:
-	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
-
-ANSIBLESERVER_BASE = v1.0.5
-
-ansibleserver-base:
-	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
-
-CLIMC_BASE_VERSION = 20210901
-
-climc-base:
-	docker buildx build --platform linux/arm64,linux/amd64 --push \
-		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
-
-BAREMETAL_BASE_VERSION = v0.3.2
-
-baremetal-base:
-	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
-	#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
-
-FILE_REPO_VERSION = v0.3.3
-
-file-repo:
-	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .

build/docker/multi-arch/Dockerfile.esxi-agent

@@ -0,0 +1,16 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN mkdir -p /root/go/src/yunion.io/x/onecloud
+COPY . /root/go/src/yunion.io/x/onecloud
+
+WORKDIR /root/go/src/yunion.io/x/onecloud
+RUN make cmd/esxi-agent
+
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+
+RUN mkdir -p /opt/yunion/bin
+COPY --from=build /root/go/src/yunion.io/x/onecloud/build/esxi-agent/root/opt/ /opt/
+COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/multi-arch/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
@@ -7,7 +7,7 @@ COPY . /root/go/src/yunion.io/x/onecloud
 WORKDIR /root/go/src/yunion.io/x/onecloud
 RUN make cmd/host
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/multi-arch/Dockerfile.host.dockerignore

@@ -1,2 +0,0 @@
-_output/alpine-build/_cache
-

build/docker/multi-arch/Dockerfile.torrent

@@ -1,24 +1,24 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
-
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
 COPY . /root/go/src/yunion.io/x/onecloud
-RUN cd /root/go/src/yunion.io/x/onecloud && make cmd/torrent
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+WORKDIR /root/go/src/yunion.io/x/onecloud
+RUN make cmd/torrent
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-# HACK: use v3.14 alpine mirror to upgrade qemu-img
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN apk update && \
-    apk add --no-cache qemu-img && \
+    apk add --no-cache tzdata ca-certificates qemu-img && \
     rm -rf /var/cache/apk/*
 
-# TAG=20210815.0
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+ENV TZ Asia/Shanghai
+
 # add executable file torrent
 # make cmd/torrent
 RUN mkdir -p /opt/yunion/bin

build/docker/multi-arch/Dockerfile.torrent.dockerignore

@@ -1,2 +0,0 @@
-_output/alpine-build/_cache
-

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT

@@ -0,0 +1,17 @@
+## {{.title}}
+- 时间: {{.start_time}}
+- 级别: {{.level}}
+
+{{ range .matches}}
+- 指标: {{.metric}}
+- 触发值: {{html .value_str}}
+
+### 触发条件:
+- {{html $.description}}
+
+### 标签
+ > 名称: {{ index .tags "name" }}
+ > ip: {{ index .tags "ip" }}
+ > 平台: {{ index .tags "brand" }}
+------
+{{- end}}

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT.email

@@ -92,7 +92,7 @@
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
-      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}
+      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
 ">请登录平台进行查看</a></td>
     </tr>
   </table>

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT

@@ -0,0 +1,17 @@
+## {{.title}}
+- Time: {{.start_time}}
+- Level: {{.level}}
+
+{{ range .matches}}
+- Metric: {{.metric}}
+- Trigger value: {{html .value_str}}
+
+### Trigger condition:
+- {{html $.description }}
+
+### Label
+ > Name: {{ index .tags "name" }}
+ > IP: {{ index .tags "ip" }}
+ > Brand: {{ index .tags "brand" }}
+------
+{{- end}}

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT.email

@@ -33,7 +33,7 @@
     font-weight: bold;
   }
   .td {
-    width: 120px;
+    width: 80px;
     padding-left: 20px;
     height: 35px;
     font-weight: 400;
@@ -92,8 +92,8 @@
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
-      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}
-">Please login to the platform to view</a></td>
+      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
+">Please log in to the platform to view</a></td>
     </tr>
   </table>
   <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT

@@ -1,9 +0,0 @@
-{{.title}}
-策略名称: {{.name}}
-触发时间: {{.start_time}}
-报警级别: {{.level}}
-触发条件: {{.description | unescaped}}
-资源数量：{{len .matches}}
-资源名称：{{.resource_name}}
-
-详情地址: {{.web_url}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT

@@ -1,9 +0,0 @@
-{{.title}}
-AlertName: {{.name}}
-Time: {{.start_time}}
-Level: {{.level}}
-TriggerCondition: {{.description | unescaped}}
-ResourceCount: {{len .matches}}
-ResourceName: {{.resource_name}}
-
-WebUrl: {{.web_url}}

build/notify/root/opt/yunion/share/local-templates/content@cn/COMMON.tmpl

@@ -1,6 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经成功{{ .action_display }}

build/notify/root/opt/yunion/share/local-templates/content@cn/CREATE.tmpl

@@ -1,64 +0,0 @@
-{{- $d := .resource_details }}
-{{- $consoleServiceType := list "loadbalancer" "dbinstance" "elasticcache" -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经创建成功
-{{- if $d.private_dns -}}
-，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
-{{- end -}}
-
-{{- if $d.public_dns -}}
-，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}
-{{- end -}}
-
-{{- if and $d.address_type $d.address -}}
-，服务地址为{{ $d.address_type }}{{ $d.address }}
-{{- end -}}
-
-{{- if $d.ips -}}
-，IP地址为{{ $d.ips }}
-{{- end -}}
-
-{{- if and $d.guest_ip_start $d.guest_ip_end -}}
-，IP范围为{{ $d.guest_ip_start }}-{{ $d.guest_ip_end }}
-{{- end -}}
-
-{{- if $d.ip_addr -}}
-，IP地址为{{ $d.ip_addr }}
-{{- end -}}
-
-{{- if $d.account -}}
-，初始帐号为{{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-，初始密码为{{ $d.password }}
-{{- end -}}
-
-{{- if $d.keypair -}}
-，访问ssh密钥为{{ $d.keypair }}
-{{- end -}}
-
-{{- if $d.common_name -}}
-，证书域名为{{ $d.common_name }}
-{{- end -}}
-
-{{- if $d.not_after -}}
-，过期时间为{{ $d.not_after }}
-{{- end -}}
-
-{{- if eq .resource_type "server" -}}
-，请使用
-{{- if $d.windows -}}
-远程桌面连接器(RDC)
-{{- else -}}
-SSH
-{{- end -}}
-或控制面板控制台访问虚拟机。
-{{- end -}}
-
-{{- if has .resource_type $consoleServiceType -}}
-，更多信息请前往控制台查看。
-{{- end -}}

build/notify/root/opt/yunion/share/local-templates/content@cn/EXPIRED_RELEASE.tmpl

@@ -1,6 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，如需续期使用，请尽快前往控制台处理

build/notify/root/opt/yunion/share/local-templates/content@cn/SCALINGPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的弹性伸缩组{{ $d.scaling_group }}中的{{ $d.trigger_type_display }}类型伸缩策略{{ $d.name }}满足触发条件，成功{{ $d.action_display }}{{ $d.number }}{{ $d.unit_display }}实例

build/notify/root/opt/yunion/share/local-templates/content@cn/SCHEDULEDTASK_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的定时任务执行成功

build/notify/root/opt/yunion/share/local-templates/content@cn/SNAPSHOTPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的自动快照策略{{ $d.name }}为硬盘{{ $d.disk }}创建快照成功

build/notify/root/opt/yunion/share/local-templates/content@cn/UPDATE.tmpl

@@ -1,14 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经{{ .action_display }}成功
-{{- if $d.account -}}
-，帐号为{{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-，密码为{{ $d.password }}
-{{- end -}}
-，更多信息请前往控制台进行查看

build/notify/root/opt/yunion/share/local-templates/content@en/COMMON.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been {{ .action_display }} successfully

build/notify/root/opt/yunion/share/local-templates/content@en/CREATE.tmpl

@@ -1,54 +0,0 @@
-{{- $d := .resource_details }}
-{{- $consoleServiceType := list "loadbalancer" "dbinstance" "elasticcache" -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been created successfully
-{{- if $d.private_dns -}}
-, the intranet address is {{ $d.private_dns }}:{{ $d.private_connect_port }}
-{{- end -}}
-
-{{- if $d.public_dns -}}
-, the internet address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
-{{- end -}}
-
-{{- if and $d.address_type $d.address -}}
-, the service address is {{ $d.address_type }}{{ $d.address }}
-{{- end -}}
-
-{{- if $d.ips -}}
-, the IP address is {{ $d.ips }}
-{{- end -}}
-
-{{- if and $d.guest_ip_start $d.guest_ip_end -}}
-, the IP range is {{ $d.guest_ip_start }}-{{ $d.guest_ip_end }}
-{{- end -}}
-
-{{- if $d.ip_addr -}}
-, the IP address is {{ $d.ip_addr }}
-{{- end -}}
-
-{{- if $d.account -}}
-, the initial account is {{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-, the initial password is {{ $d.password }}
-{{- end -}}
-
-{{- if $d.keypair -}}
-, the access ssh key is {{ $d.keypair }}
-{{- end -}}
-
-{{- if $d.common_name -}}
-, the certificate domain name is {{ $d.common_name }}
-{{- end -}}
-
-{{- if $d.not_after -}}
-, the expiration is {{ $d.not_after }}
-{{- end -}}
-
-{{- if eq .resource_type "server" -}}
-, and please use {{ if $d.windows -}} Remote Desktop Connector (RDC) {{ else -}} SSH {{ end -}} or the control panel console to access the VM.
-{{- end -}}
-
-{{- if has .resource_type $consoleServiceType -}}
-. For more information, please go to the console to view
-{{- end -}}

build/notify/root/opt/yunion/share/local-templates/content@en/EXPIRED_RELEASE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. If you need to renew, please go to the console as soon as possible

build/notify/root/opt/yunion/share/local-templates/content@en/SCALINGPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ $d.trigger_type_display }} type scaling policy {{ $d.name }} in the scaling group {{ $d.scaling_group }} of the {{ $d.project }} project satisfies the trigger conditions, and {{ $d.action_display }} {{ $d.number }}{{ $d.unit_display }} instances successfully

build/notify/root/opt/yunion/share/local-templates/content@en/SCHEDULEDTASK_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scheduled task in {{ $d.project }} successfully {{ $d.operation_display }} the {{ $d.resource_type_display }} {{ $d.resource_name }}

build/notify/root/opt/yunion/share/local-templates/content@en/SNAPSHOTPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The snapshot policy {{ $d.name }} in the {{ $d.project }} project successfully creates a snapshot for the disk {{ $d.disk }}

build/notify/root/opt/yunion/share/local-templates/content@en/UPDATE.tmpl

@@ -1,10 +0,0 @@
-{{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been {{ .action_display }} successfully
-{{- if $d.account -}}
-, the acount is {{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-, the password is {{ $d.password }}
-{{- end -}}
-, and please go to the console to view more information

build/notify/root/opt/yunion/share/local-templates/title@cn/COMMON.tmpl

@@ -1,5 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if $d.project -}}
-{{ $d.project }}项目的
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功

build/notify/root/opt/yunion/share/local-templates/title@cn/CREATE.tmpl

@@ -1,5 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if $d.project -}}
-{{ $d.project }}项目的
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}创建成功

build/notify/root/opt/yunion/share/local-templates/title@cn/EXPIRED_RELEASE.tmpl

@@ -1,3 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的
-{{ .resource_type_display }}{{ $d.name }}到期前{{ .advance_days }}天通知

build/notify/root/opt/yunion/share/local-templates/title@cn/SCALINGPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的弹性伸缩组{{ $d.scaling_group }}中的伸缩策略{{ $d.name }}满足触发

build/notify/root/opt/yunion/share/local-templates/title@cn/SCHEDULEDTASK_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scheduled task in {{ $d.project }} successfully {{ $d.operation_display }} the {{ $d.resource_type_display }} {{ $d.resource_name }}

build/notify/root/opt/yunion/share/local-templates/title@cn/SNAPSHOTPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的自动快照策略{{ $d.name }}生效

build/notify/root/opt/yunion/share/local-templates/title@cn/UPDATE.tmpl

@@ -1,3 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的
-{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功

build/notify/root/opt/yunion/share/local-templates/title@en/COMMON.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ .resource_type_display }} {{ .Name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} {{ .action_display }} successfully

build/notify/root/opt/yunion/share/local-templates/title@en/CREATE.tmpl

@@ -1,3 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ .resource_type_display }} {{ $d.name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} created successfully
-

build/notify/root/opt/yunion/share/local-templates/title@en/EXPIRED_RELEASE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ .advance_days }} days notice before {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} expiration

build/notify/root/opt/yunion/share/local-templates/title@en/SCALINGPOLICY_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scaling policy {{ $d.name }} in the scaling group {{ $d.scaling_group }} triggered

build/notify/root/opt/yunion/share/local-templates/title@en/SCHEDULEDTASK_EXECUTE.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scheduled task in {{ $d.project }} execute successfully