diff --git a/manager/src/main/resources/define/app-cisco_switch.yml b/manager/src/main/resources/define/app-cisco_switch.yml index 9306afc244e..63370038664 100644 --- a/manager/src/main/resources/define/app-cisco_switch.yml +++ b/manager/src/main/resources/define/app-cisco_switch.yml @@ -338,13 +338,11 @@ metrics: en-US: In Octets - field: in_discards type: 0 - unit: 'package' i18n: zh-CN: 入丢包数 en-US: In Discards - field: in_errors type: 0 - unit: 'package' i18n: zh-CN: 入错包数 en-US: In Errors @@ -356,13 +354,11 @@ metrics: en-US: Out Octets - field: out_discards type: 0 - unit: 'package' i18n: zh-CN: 出丢包数 en-US: Out Discards - field: out_errors type: 0 - unit: 'package' i18n: zh-CN: 出错包数 en-US: Out Errors @@ -397,11 +393,11 @@ metrics: - index=ifIndex - descr=ifDescr - mtu=ifMtu - - speed=ifSpeed / 8 / 1024 / 1024 - - in_octets=ifInOctets / 1024 / 1024 + - speed=ifSpeed / 1000 / 1000 + - in_octets=ifInOctets / 1000 / 1000 - in_discards=ifInDiscards - in_errors=ifInErrors - - out_octets=ifOutOctets / 1024 / 1024 + - out_octets=ifOutOctets / 1000 / 1000 - out_discards=ifOutDiscards - out_errors=ifOutErrors - admin_status=ifAdminStatus diff --git a/manager/src/main/resources/define/app-h3c_switch.yml b/manager/src/main/resources/define/app-h3c_switch.yml index 0562c2aeacf..0f21445658c 100644 --- a/manager/src/main/resources/define/app-h3c_switch.yml +++ b/manager/src/main/resources/define/app-h3c_switch.yml @@ -338,13 +338,11 @@ metrics: en-US: In Octets - field: in_discards type: 0 - unit: 'package' i18n: zh-CN: 入丢包数 en-US: In Discards - field: in_errors type: 0 - unit: 'package' i18n: zh-CN: 入错包数 en-US: In Errors @@ -356,13 +354,11 @@ metrics: en-US: Out Octets - field: out_discards type: 0 - unit: 'package' i18n: zh-CN: 出丢包数 en-US: Out Discards - field: out_errors type: 0 - unit: 'package' i18n: zh-CN: 出错包数 en-US: Out Errors @@ -396,11 +392,11 @@ metrics: - index=ifIndex - descr=ifDescr - mtu=ifMtu - - speed=ifSpeed / 8 / 1024 / 1024 - - in_octets=ifInOctets / 1024 / 1024 + - speed=ifSpeed / 1000 / 1000 + - in_octets=ifInOctets / 1000 / 1000 - in_discards=ifInDiscards - in_errors=ifInErrors - - out_octets=ifOutOctets / 1024 / 1024 + - out_octets=ifOutOctets / 1000 / 1000 - out_discards=ifOutDiscards - out_errors=ifOutErrors - admin_status=ifAdminStatus diff --git a/manager/src/main/resources/define/app-hpe_switch.yml b/manager/src/main/resources/define/app-hpe_switch.yml index 75b6797f6c8..48a672a9ce5 100644 --- a/manager/src/main/resources/define/app-hpe_switch.yml +++ b/manager/src/main/resources/define/app-hpe_switch.yml @@ -338,13 +338,11 @@ metrics: en-US: In Octets - field: in_discards type: 0 - unit: 'package' i18n: zh-CN: 入丢包数 en-US: In Discards - field: in_errors type: 0 - unit: 'package' i18n: zh-CN: 入错包数 en-US: In Errors @@ -356,13 +354,11 @@ metrics: en-US: Out Octets - field: out_discards type: 0 - unit: 'package' i18n: zh-CN: 出丢包数 en-US: Out Discards - field: out_errors type: 0 - unit: 'package' i18n: zh-CN: 出错包数 en-US: Out Errors @@ -397,11 +393,11 @@ metrics: - index=ifIndex - descr=ifDescr - mtu=ifMtu - - speed=ifSpeed / 8 / 1024 / 1024 - - in_octets=ifInOctets / 1024 / 1024 + - speed=ifSpeed / 1000 / 1000 + - in_octets=ifInOctets / 1000 / 1000 - in_discards=ifInDiscards - in_errors=ifInErrors - - out_octets=ifOutOctets / 1024 / 1024 + - out_octets=ifOutOctets / 1000 / 1000 - out_discards=ifOutDiscards - out_errors=ifOutErrors - admin_status=ifAdminStatus diff --git a/manager/src/main/resources/define/app-huawei_switch.yml b/manager/src/main/resources/define/app-huawei_switch.yml index a4a807d8f47..a73c66b0aea 100644 --- a/manager/src/main/resources/define/app-huawei_switch.yml +++ b/manager/src/main/resources/define/app-huawei_switch.yml @@ -337,13 +337,11 @@ metrics: en-US: In Octets - field: in_discards type: 0 - unit: 'package' i18n: zh-CN: 入丢包数 en-US: In Discards - field: in_errors type: 0 - unit: 'package' i18n: zh-CN: 入错包数 en-US: In Errors @@ -355,13 +353,11 @@ metrics: en-US: Out Octets - field: out_discards type: 0 - unit: 'package' i18n: zh-CN: 出丢包数 en-US: Out Discards - field: out_errors type: 0 - unit: 'package' i18n: zh-CN: 出错包数 en-US: Out Errors @@ -395,11 +391,11 @@ metrics: - index=ifIndex - descr=ifDescr - mtu=ifMtu - - speed=ifSpeed / 8 / 1024 / 1024 - - in_octets=ifInOctets / 1024 / 1024 + - speed=ifSpeed / 1000 / 1000 + - in_octets=ifInOctets / 1000 / 1000 - in_discards=ifInDiscards - in_errors=ifInErrors - - out_octets=ifOutOctets / 1024 / 1024 + - out_octets=ifOutOctets / 1000 / 1000 - out_discards=ifOutDiscards - out_errors=ifOutErrors - admin_status=ifAdminStatus diff --git a/manager/src/main/resources/define/app-tplink_switch.yml b/manager/src/main/resources/define/app-tplink_switch.yml index d40bc46e634..306b133b977 100644 --- a/manager/src/main/resources/define/app-tplink_switch.yml +++ b/manager/src/main/resources/define/app-tplink_switch.yml @@ -337,13 +337,11 @@ metrics: en-US: In Octets - field: in_discards type: 0 - unit: 'package' i18n: zh-CN: 入丢包数 en-US: In Discards - field: in_errors type: 0 - unit: 'package' i18n: zh-CN: 入错包数 en-US: In Errors @@ -355,13 +353,11 @@ metrics: en-US: Out Octets - field: out_discards type: 0 - unit: 'package' i18n: zh-CN: 出丢包数 en-US: Out Discards - field: out_errors type: 0 - unit: 'package' i18n: zh-CN: 出错包数 en-US: Out Errors @@ -395,11 +391,11 @@ metrics: - index=ifIndex - descr=ifDescr - mtu=ifMtu - - speed=ifSpeed / 8 / 1024 / 1024 - - in_octets=ifInOctets / 1024 / 1024 + - speed=ifSpeed / 1000 / 1000 + - in_octets=ifInOctets / 1000 / 1000 - in_discards=ifInDiscards - in_errors=ifInErrors - - out_octets=ifOutOctets / 1024 / 1024 + - out_octets=ifOutOctets / 1000 / 1000 - out_discards=ifOutDiscards - out_errors=ifOutErrors - admin_status=ifAdminStatus diff --git a/script/assembly/server/assembly-docker-compose.xml b/script/assembly/server/assembly-docker-compose.xml index b7a58d8ea42..33784c03660 100644 --- a/script/assembly/server/assembly-docker-compose.xml +++ b/script/assembly/server/assembly-docker-compose.xml @@ -77,6 +77,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 "> true README.md + LICENSE / @@ -89,7 +90,6 @@ http://maven.apache.org/ASSEMBLY/2.0.0 "> DISCLAIMER LICENSE NOTICE - README.md diff --git a/script/docker-compose/LICENSE b/script/docker-compose/LICENSE new file mode 100644 index 00000000000..261eeb9e9f8 --- /dev/null +++ b/script/docker-compose/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml index e849ffd5035..c0f58018a63 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml @@ -109,6 +109,11 @@ spring: ssl: enable: true +common: + queue: + # memory or kafka + type: memory + warehouse: store: # store history metrics data, enable only one below @@ -126,21 +131,23 @@ warehouse: # 数据存储时间:默认'7776000000'(90天,单位为毫秒,-1代表永不过期) # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire) expire-time: '7776000000' -# store real-time metrics data, enable only one below -# 存储实时数据方式, 下方只能enabled启用一种方式 + # store real-time metrics data, enable only one below + real-time: memory: enabled: true init-size: 16 redis: enabled: false - host: 127.0.0.1 - port: 6379 + # redis mode: single, sentinel, cluster. Default is single + mode: single + # separate each address with comma when using cluster mode, eg: 127.0.0.1:6379,127.0.0.1:6380 + address: 127.0.0.1:6379 + # enter master name when using sentinel mode + masterName: mymaster password: 123456 + # redis db index, default: DB0 + db: 0 -common: - queue: - # memory or kafka - type: memory alerter: # custom console url @@ -155,7 +162,7 @@ alerter: telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage # discord discord-webhook-url: https://discord.com/api/v9/channels/%s/messages - # server酱 + # serverChan server-chan-webhook-url: https://sctapi.ftqq.com/%s.send # gotify gotify-webhook-url: http://127.0.0.1/message?token=%s @@ -165,3 +172,8 @@ scheduler: enabled: true port: 1158 +grafana: + enabled: false + url: http://127.0.0.1:3000 + username: admin + password: admin diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml index c7253ff88c8..9ebd316af1e 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/sureness.yml @@ -58,6 +58,14 @@ resourceRole: - /api/status/page/**===post===[admin,user] - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] + - /api/grafana/**===get===[admin,user,guest] + - /api/grafana/**===post===[admin,user] + - /api/grafana/**===put===[admin,user] + - /api/grafana/**===delete===[admin] + - /api/bulletin/**===get===[admin,user,guest] + - /api/bulletin/**===post===[admin,user] + - /api/bulletin/**===put===[admin,user] + - /api/bulletin/**===delete===[admin] # config the resource restful api that need bypass auth protection # rule: api===method diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml index f44da6164e0..459e0d2ca5c 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml @@ -109,6 +109,11 @@ spring: ssl: enable: true +common: + queue: + # memory or kafka + type: memory + warehouse: store: # store history metrics data, enable only one below @@ -122,19 +127,23 @@ warehouse: url: jdbc:TAOS-RS://tdengine:6041/hertzbeat username: root password: taosdata + # store real-time metrics data, enable only one below + real-time: memory: enabled: true init-size: 16 redis: enabled: false - host: 127.0.0.1 - port: 6379 + # redis mode: single, sentinel, cluster. Default is single + mode: single + # separate each address with comma when using cluster mode, eg: 127.0.0.1:6379,127.0.0.1:6380 + address: 127.0.0.1:6379 + # enter master name when using sentinel mode + masterName: mymaster password: 123456 + # redis db index, default: DB0 + db: 0 -common: - queue: - # memory or kafka - type: memory alerter: # custom console url @@ -149,7 +158,7 @@ alerter: telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage # discord discord-webhook-url: https://discord.com/api/v9/channels/%s/messages - # server酱 + # serverChan server-chan-webhook-url: https://sctapi.ftqq.com/%s.send # gotify gotify-webhook-url: http://127.0.0.1/message?token=%s @@ -159,3 +168,9 @@ scheduler: enabled: true port: 1158 +grafana: + enabled: false + url: http://127.0.0.1:3000 + username: admin + password: admin + diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml index c7253ff88c8..9ebd316af1e 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/sureness.yml @@ -58,6 +58,14 @@ resourceRole: - /api/status/page/**===post===[admin,user] - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] + - /api/grafana/**===get===[admin,user,guest] + - /api/grafana/**===post===[admin,user] + - /api/grafana/**===put===[admin,user] + - /api/grafana/**===delete===[admin] + - /api/bulletin/**===get===[admin,user,guest] + - /api/bulletin/**===post===[admin,user] + - /api/bulletin/**===put===[admin,user] + - /api/bulletin/**===delete===[admin] # config the resource restful api that need bypass auth protection # rule: api===method diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml index b506c55ad08..86132477c36 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml @@ -121,16 +121,22 @@ warehouse: url: http://victoria-metrics:8428 username: root password: root - # store real-time metrics data, enable only one below - # 存储实时数据方式, 下方只能enabled启用一种方式 + # store real-time metrics data, enable only one below + real-time: memory: enabled: true init-size: 16 redis: enabled: false - host: 127.0.0.1 - port: 6379 + # redis mode: single, sentinel, cluster. Default is single + mode: single + # separate each address with comma when using cluster mode, eg: 127.0.0.1:6379,127.0.0.1:6380 + address: 127.0.0.1:6379 + # enter master name when using sentinel mode + masterName: mymaster password: 123456 + # redis db index, default: DB0 + db: 0 common: queue: @@ -150,7 +156,7 @@ alerter: telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage # discord discord-webhook-url: https://discord.com/api/v9/channels/%s/messages - # server酱 + # serverChan server-chan-webhook-url: https://sctapi.ftqq.com/%s.send # gotify gotify-webhook-url: http://127.0.0.1/message?token=%s @@ -159,3 +165,9 @@ scheduler: server: enabled: true port: 1158 + +grafana: + enabled: false + url: http://127.0.0.1:3000 + username: admin + password: admin diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml index c7253ff88c8..9ebd316af1e 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/sureness.yml @@ -58,6 +58,14 @@ resourceRole: - /api/status/page/**===post===[admin,user] - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] + - /api/grafana/**===get===[admin,user,guest] + - /api/grafana/**===post===[admin,user] + - /api/grafana/**===put===[admin,user] + - /api/grafana/**===delete===[admin] + - /api/bulletin/**===get===[admin,user,guest] + - /api/bulletin/**===post===[admin,user] + - /api/bulletin/**===put===[admin,user] + - /api/bulletin/**===delete===[admin] # config the resource restful api that need bypass auth protection # rule: api===method diff --git a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml index c4aeefdce27..86d662add16 100644 --- a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml @@ -120,16 +120,22 @@ warehouse: url: http://victoria-metrics:8428 username: root password: root - # store real-time metrics data, enable only one below - # 存储实时数据方式, 下方只能enabled启用一种方式 + # store real-time metrics data, enable only one below + real-time: memory: enabled: true init-size: 16 redis: enabled: false - host: 127.0.0.1 - port: 6379 + # redis mode: single, sentinel, cluster. Default is single + mode: single + # separate each address with comma when using cluster mode, eg: 127.0.0.1:6379,127.0.0.1:6380 + address: 127.0.0.1:6379 + # enter master name when using sentinel mode + masterName: mymaster password: 123456 + # redis db index, default: DB0 + db: 0 common: queue: @@ -149,7 +155,7 @@ alerter: telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage # discord discord-webhook-url: https://discord.com/api/v9/channels/%s/messages - # server酱 + # serverChan server-chan-webhook-url: https://sctapi.ftqq.com/%s.send # gotify gotify-webhook-url: http://127.0.0.1/message?token=%s @@ -158,3 +164,9 @@ scheduler: server: enabled: true port: 1158 + +grafana: + enabled: false + url: http://127.0.0.1:3000 + username: admin + password: admin diff --git a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sureness.yml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sureness.yml index c7253ff88c8..9ebd316af1e 100644 --- a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sureness.yml +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/sureness.yml @@ -58,6 +58,14 @@ resourceRole: - /api/status/page/**===post===[admin,user] - /api/status/page/**===put===[admin,user] - /api/status/page/**===delete===[admin] + - /api/grafana/**===get===[admin,user,guest] + - /api/grafana/**===post===[admin,user] + - /api/grafana/**===put===[admin,user] + - /api/grafana/**===delete===[admin] + - /api/bulletin/**===get===[admin,user,guest] + - /api/bulletin/**===post===[admin,user] + - /api/bulletin/**===put===[admin,user] + - /api/bulletin/**===delete===[admin] # config the resource restful api that need bypass auth protection # rule: api===method