From 474b25e768bf710395f7e84654eecef04e2b9510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 12 Oct 2018 10:45:24 +0800 Subject: [PATCH] Set assemble based on assemble setting files. (#1756) --- .../main/assembly/alarm-settings-sample.yml | 46 +++++++++++++++++++ .../src/main/assembly/alarm-settings.yml | 37 +++++++++++++++ .../src/main/assembly/assembly.xml | 5 +- .../src/main/resources/alarm-settings.yml | 2 +- 4 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 oap-server/server-starter/src/main/assembly/alarm-settings-sample.yml create mode 100644 oap-server/server-starter/src/main/assembly/alarm-settings.yml diff --git a/oap-server/server-starter/src/main/assembly/alarm-settings-sample.yml b/oap-server/server-starter/src/main/assembly/alarm-settings-sample.yml new file mode 100644 index 0000000000..67a60de440 --- /dev/null +++ b/oap-server/server-starter/src/main/assembly/alarm-settings-sample.yml @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Sample alarm rules. +rules: + # Rule unique name, must be ended with `_rule`. + endpoint_percent_rule: + # Indicator value need to be long, double or int + indicator-name: endpoint_percent + threshold: 75 + op: < + # The length of time to evaluate the metric + period: 10 + # How many times after the metric match the condition, will trigger alarm + count: 3 + # How many times of checks, the alarm keeps silence after alarm triggered, default as same as period. + silence-period: 10 + message: Successful rate of endpoint {name} is lower than 75% + service_resp_time_rule: + indicator-name: service_resp_time + # [Optional] Default, match all services in this indicator + include-names: + - dubbox-provider + - dubbox-consumer + threshold: 1000 + op: ">" + period: 10 + count: 1 + +#webhooks: +# - http://127.0.0.1/notify/ +# - http://127.0.0.1/go-wechat/ + diff --git a/oap-server/server-starter/src/main/assembly/alarm-settings.yml b/oap-server/server-starter/src/main/assembly/alarm-settings.yml new file mode 100644 index 0000000000..6c69f89d60 --- /dev/null +++ b/oap-server/server-starter/src/main/assembly/alarm-settings.yml @@ -0,0 +1,37 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Sample alarm rules. +rules: +# Sample alarm rules. +# # Rule unique name, must be ended with `_rule`. +# endpoint_percent_rule: +# # Indicator value need to be long, double or int +# indicator-name: endpoint_percent +# threshold: 75 +# op: < +# # The length of time to evaluate the metric +# period: 10 +# # How many times after the metric match the condition, will trigger alarm +# count: 3 +# # How many times of checks, the alarm keeps silence after alarm triggered, default as same as period. +# silence-period: 10 +# message: Successful rate of endpoint {name} is lower than 75% + +webhooks: +# - http://127.0.0.1/notify/ +# - http://127.0.0.1/go-wechat/ + diff --git a/oap-server/server-starter/src/main/assembly/assembly.xml b/oap-server/server-starter/src/main/assembly/assembly.xml index 0f234cd796..0d27a160de 100644 --- a/oap-server/server-starter/src/main/assembly/assembly.xml +++ b/oap-server/server-starter/src/main/assembly/assembly.xml @@ -36,13 +36,14 @@ /config log4j2.xml + application.yml + alarm-settings.yml + alarm-settings-sample.yml src/main/resources - application.yml - log4j2.xml component-libraries.yml /config diff --git a/oap-server/server-starter/src/main/resources/alarm-settings.yml b/oap-server/server-starter/src/main/resources/alarm-settings.yml index 55c150eaf8..9ea69756ba 100644 --- a/oap-server/server-starter/src/main/resources/alarm-settings.yml +++ b/oap-server/server-starter/src/main/resources/alarm-settings.yml @@ -40,7 +40,7 @@ rules: period: 10 count: 1 -#webhooks: +webhooks: # - http://127.0.0.1/notify/ # - http://127.0.0.1/go-wechat/ -- GitLab