diff --git a/.gitignore b/.gitignore index bad93d68d1..4b45a7135b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ mvnw.bat package-lock.json *.zip jdk/ +data/ ### STS ### .apt_generated @@ -54,3 +55,5 @@ node_modules application-dev.yml application-mysql.yml application-pg.yml +/package.json +/yarn.lock diff --git a/hertzbeat-manager/src/main/resources/db/migration/mysql/V170__update_column.sql b/hertzbeat-manager/src/main/resources/db/migration/mysql/V170__update_column.sql index 754483fbf6..8f1f310127 100644 --- a/hertzbeat-manager/src/main/resources/db/migration/mysql/V170__update_column.sql +++ b/hertzbeat-manager/src/main/resources/db/migration/mysql/V170__update_column.sql @@ -17,71 +17,44 @@ -- ensure every sql can rerun without error +-- add repair table sql +REPAIR TABLE HZB_ALERT_DEFINE; + DELIMITER // CREATE PROCEDURE AddOrDropColumns() BEGIN DECLARE col_exists INT; - -- Check and add 'app' column if it does not exist -SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='app'; -IF col_exists = 0 THEN -ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN app VARCHAR(255); -END IF; -- Drop 'app' column if it exists SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='app'; IF col_exists = 1 THEN ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN app; END IF; - -- Check and add 'metric' column if it does not exist -SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='metric'; -IF col_exists = 0 THEN -ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN metric VARCHAR(255); -END IF; -- Drop 'metric' column if it exists SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='metric'; IF col_exists = 1 THEN ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN metric; END IF; - -- Check and add 'field' column if it does not exist -SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='field'; -IF col_exists = 0 THEN -ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN field VARCHAR(255); -END IF; -- Drop 'field' column if it exists SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='field'; IF col_exists = 1 THEN ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN field; END IF; - -- Check and add 'preset' column if it does not exist -SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='preset'; -IF col_exists = 0 THEN -ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN preset BOOLEAN; -END IF; -- Drop 'preset' column if it exists SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='preset'; IF col_exists = 1 THEN ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN preset; END IF; - -- Check and add 'priority' column if it does not exist -SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='priority'; -IF col_exists = 0 THEN -ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN priority INTEGER; -END IF; -- Drop 'priority' column if it exists SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='priority'; IF col_exists = 1 THEN ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN priority; END IF; - -- Check and add 'tags' column if it does not exist -SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='tags'; -IF col_exists = 0 THEN -ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN tags VARCHAR(255); -END IF; -- Drop 'tags' column if it exists SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='tags'; IF col_exists = 1 THEN @@ -93,4 +66,5 @@ DELIMITER ; CALL AddOrDropColumns(); -DROP PROCEDURE IF EXISTS AddOrDropColumns; \ No newline at end of file +DROP PROCEDURE IF EXISTS AddOrDropColumns; +commit; diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml index ff6a9fc4c0..f803893511 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml @@ -21,20 +21,20 @@ networks: services: mysql: - image: mysql:8 + image: mariadb:11.7 container_name: compose-mysql hostname: mysql restart: always healthcheck: - test: ['CMD-SHELL', 'mysqladmin ping -h 127.0.0.1 --silent'] - interval: 3s + test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] + interval: 10s retries: 5 - start_period: 3m + start_period: 30s ports: - - "3306" + - '13306:3306' environment: TZ: Asia/Shanghai - MYSQL_ROOT_PASSWORD: 123456 + MARIADB_ROOT_PASSWORD: 123456 volumes: - ./dbdata/mysqldata:/var/lib/mysql/ - ./conf/sql:/docker-entrypoint-initdb.d/ @@ -55,8 +55,8 @@ services: environment: TZ: Asia/Shanghai ports: - - "8181" - - "6667" + - "18181:8181" + - "16667:6667" volumes: - ./dbdata/iotdbdata:/iotdb/data networks: diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml index 64975e55ad..a07b337dc4 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml @@ -21,20 +21,20 @@ networks: services: mysql: - image: mysql:8 + image: mariadb:11.7 container_name: compose-mysql hostname: mysql restart: always healthcheck: - test: ['CMD-SHELL', 'mysqladmin ping -h 127.0.0.1 --silent'] - interval: 3s + test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] + interval: 10s retries: 5 - start_period: 3m + start_period: 30s ports: - - "3306" + - '13306:3306' environment: TZ: Asia/Shanghai - MYSQL_ROOT_PASSWORD: 123456 + MARIADB_ROOT_PASSWORD: 123456 volumes: - ./dbdata/mysqldata:/var/lib/mysql/ - ./conf/sql:/docker-entrypoint-initdb.d/ @@ -55,7 +55,7 @@ services: environment: TZ: Asia/Shanghai ports: - - "6041" + - "16041:6041" volumes: - ./dbdata/taosdata:/var/lib/taos/ networks: diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml index 0a6b720cd8..1b3ddb6ac1 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml @@ -21,20 +21,20 @@ networks: services: mysql: - image: mysql:8 + image: mariadb:11.7 container_name: compose-mysql hostname: mysql restart: always healthcheck: - test: ['CMD-SHELL', 'mysqladmin ping -h 127.0.0.1 --silent'] - interval: 3s + test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] + interval: 10s retries: 5 - start_period: 3m + start_period: 30s ports: - - "3306" + - '13306:3306' environment: TZ: Asia/Shanghai - MYSQL_ROOT_PASSWORD: 123456 + MARIADB_ROOT_PASSWORD: 123456 volumes: - ./dbdata/mysqldata:/var/lib/mysql/ - ./conf/sql:/docker-entrypoint-initdb.d/ @@ -55,7 +55,7 @@ services: environment: TZ: Asia/Shanghai ports: - - "8428" + - "18428:8428" volumes: - ./dbdata/tsdbdata:/victoria-metrics-data networks: diff --git a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml index 1f3fef0a83..40f6e05e82 100644 --- a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/docker-compose.yaml @@ -32,14 +32,15 @@ services: retries: 5 start_period: 30s ports: - - '5432:5432' + - '15432:5432' environment: POSTGRES_USER: root POSTGRES_PASSWORD: 123456 TZ: Asia/Shanghai + PGDATA: /var/lib/postgresql/data/pgdata volumes: - - ./dbdata/pgdata/data:/var/lib/postgresql/data - - ./conf/sql:/docker-entrypoint-initdb.d/ + - ./dbdata/pgdata:/var/lib/postgresql/data + - ./conf/sql:/docker-entrypoint-initdb.d/ networks: - hertzbeat @@ -57,7 +58,7 @@ services: environment: TZ: Asia/Shanghai ports: - - "8428" + - "18428:8428" volumes: - ./dbdata/tsdbdata:/victoria-metrics-data networks: diff --git a/script/docker/collector/build.sh b/script/docker/collector/build.sh index 032f75e94f..03c3e3f81a 100644 --- a/script/docker/collector/build.sh +++ b/script/docker/collector/build.sh @@ -41,7 +41,7 @@ COMMAND="docker buildx build --platform linux/arm64,linux/amd64 -t apache/hertzb # Build Local -#COMMAND="docker build -t apache/hertzbeat-collector:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR " +#COMMAND="docker build -t apache/hertzbeat-collector:$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR --build-arg VERSION="$VERSION" " echo "$COMMAND" diff --git a/script/docker/server/build.sh b/script/docker/server/build.sh index 16942cee62..34b98f0802 100755 --- a/script/docker/server/build.sh +++ b/script/docker/server/build.sh @@ -37,13 +37,9 @@ COMMAND="docker buildx build --platform ${IMAGE_PLATFORM:-linux/arm64,linux/amd6 # Build Local -#COMMAND="docker build -t apache/hertzbeat:latest -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR " +#COMMAND="docker build -t apache/hertzbeat:$VERSION -f $CURRENT_DIR/Dockerfile $CONTEXT_DIR " -echo "$COMMAND" - -$COMMAND - -COMMAND="docker tag apache/hertzbeat:v$VERSION apache/hertzbeat:${IMAGE_VERSION:-latest}" +#COMMAND="docker tag apache/hertzbeat:$VERSION apache/hertzbeat:${IMAGE_VERSION:-latest}" echo "$COMMAND"