refactor: global webhook add env proxy (#2367)

.gitignore

@@ -65,7 +65,3 @@ queries.active
 
 /n9e-*
 n9e.sql
-
-!/datasource
-
-.env.json

LICENSE

@@ -1,201 +1,433 @@
-                                 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 CCF ODC.
-
-   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.
+                              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 (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
+ 
+ 
+ 
+ 
+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.

README.md

@@ -3,7 +3,7 @@
     <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="100" /></a>
 </p>
 <p align="center">
-  <b>开源告警管理专家</b>
+  <b>开源告警管理专家 一体化的可观测平台</b>
 </p>
 
 <p align="center">
@@ -27,86 +27,75 @@
 
 [English](./README_en.md) | [中文](./README.md)
 
-## 夜莺是什么
+## 夜莺 Nightingale 是什么
 
-夜莺监控（Nightingale）是一款侧重告警的监控类开源项目。类似 Grafana 的数据源集成方式，夜莺也是对接多种既有的数据源，不过 Grafana 侧重在可视化，夜莺是侧重在告警引擎、告警事件的处理和分发。
+夜莺监控是一款开源云原生观测分析工具，采用 All-in-One 的设计理念，集数据采集、可视化、监控告警、数据分析于一体，与云原生生态紧密集成，提供开箱即用的企业级监控分析和告警能力。夜莺于 2020 年 3 月 20 日，在 GitHub 上发布 v1 版本，已累计迭代 100 多个版本。
 
-夜莺监控项目，最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。
-
-## 夜莺的工作逻辑
-
-很多用户已经自行采集了指标、日志数据，此时就把存储库（VictoriaMetrics、ElasticSearch等）作为数据源接入夜莺，即可在夜莺里配置告警规则、通知规则，完成告警事件的生成和派发。
-
-![夜莺产品架构](doc/img/readme/20240221152601.png)
-
-夜莺项目本身不提供监控数据采集能力。推荐您使用 [Categraf](https://github.com/flashcatcloud/categraf) 作为采集器，可以和夜莺丝滑对接。
-
-[Categraf](https://github.com/flashcatcloud/categraf) 可以采集操作系统、网络设备、各类中间件、数据库的监控数据，通过 Remote Write 协议推送给夜莺，夜莺把监控数据转存到时序库（如 Prometheus、VictoriaMetrics 等），并提供告警和可视化能力。
-
-对于个别边缘机房，如果和中心夜莺服务端网络链路不好，希望提升告警可用性，夜莺也提供边缘机房告警引擎下沉部署模式，这个模式下，即便边缘和中心端网络割裂，告警功能也不受影响。
-
-![边缘部署模式](doc/img/readme/20240222102119.png)
-
-> 上图中，机房A和中心机房的网络链路很好，所以直接由中心端的夜莺进程做告警引擎，机房B和中心机房的网络链路不好，所以在机房B部署了 `n9e-edge` 做告警引擎，对机房B的数据源做告警判定。
-
-## 告警降噪、升级、协同
-
-夜莺的侧重点是做告警引擎，即负责产生告警事件，并根据规则做灵活派发，内置支持 20 种通知媒介（电话、短信、邮件、钉钉、飞书、企微、Slack 等）。
-
-如果您有更高级的需求，比如：
-
-- 想要把公司的多套监控系统产生的事件聚拢到一个平台，统一做收敛降噪、响应处理、数据分析
-- 想要支持人员的排班，践行 On-call 文化，想要支持告警认领、升级（避免遗漏）、协同处理
-
-那夜莺是不合适的，推荐您选用 [FlashDuty](https://flashcat.cloud/product/flashcat-duty/) 这样的 On-call 产品，产品简单易用，也有免费套餐。
+夜莺最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。夜莺的核心研发团队，也是 Open-Falcon 项目原核心研发人员，从 2014 年（Open-Falcon 是 2014 年开源）算起来，也有 10 年了，只为把监控这个事情做好。
 
 
-## 相关资料 & 交流渠道
-- 📚 [夜莺介绍PPT](https://mp.weixin.qq.com/s/Mkwx_46xrltSq8NLqAIYow) 对您了解夜莺各项关键特性会有帮助（PPT链接在文末）
-- 👉 [文档中心](https://flashcat.cloud/docs/) 为了更快的访问速度，站点托管在 [FlashcatCloud](https://flashcat.cloud)
-- ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml) 写清楚问题描述、复现步骤、截图等信息，更容易得到答案
+## 快速开始
+- 👉 [文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
+- ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
+- ℹ️ 为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)
 - 💡 前后端代码分离，前端代码仓库：[https://github.com/n9e/fe](https://github.com/n9e/fe)
-- 🎯 关注[这个公众号](https://gitlink.org.cn/UlricQin)了解更多夜莺动态和知识
-- 🌟 加我微信：`picobyte`（我已关闭好友验证）拉入微信群，备注：`夜莺互助群`，如果已经把夜莺上到生产环境，可联系我拉入资深监控用户群
+
+## 功能特点
+
+- 对接多种时序库：支持对接 Prometheus、VictoriaMetrics、Thanos、Mimir、M3DB、TDengine 等多种时序库，实现统一告警管理。
+- 专业告警能力：内置支持多种告警规则，可以扩展支持常见通知媒介，支持告警屏蔽/抑制/订阅/自愈、告警事件管理。
+- 高性能可视化引擎：支持多种图表样式，内置众多 Dashboard 模版，也可导入 Grafana 模版，开箱即用，开源协议商业友好。
+- 支持常见采集器：支持 [Categraf](https://flashcat.cloud/product/categraf)、Telegraf、Grafana-agent、Datadog-agent、各种 Exporter 作为采集器，没有什么数据是不能监控的。
+- 👀无缝搭配 [Flashduty](https://flashcat.cloud/product/flashcat-duty/)：实现告警聚合收敛、认领、升级、排班、IM集成，确保告警处理不遗漏，减少打扰，高效协同。
 
 
-## 关键特性简介
-
-![夜莺告警规则](doc/img/readme/2025-05-23_18-43-37.png)
-
-- 夜莺支持告警规则、屏蔽规则、订阅规则、通知规则，内置支持 20 种通知媒介，支持消息模板自定义
-- 支持事件管道，对告警事件做 Pipeline 处理，方便和自有系统做自动化整合，比如给告警事件附加一些元信息，对事件做 relabel
-- 支持业务组概念，引入权限体系，分门别类管理各类规则
-- 很多数据库、中间件内置了告警规则，可以直接导入使用，也可以直接导入 Prometheus 的告警规则
-- 支持告警自愈，即告警之后自动触发一个脚本执行一些预定义的逻辑，比如清理一下磁盘、抓一下现场等
-
-![夜莺事件大盘](doc/img/readme/2025-05-30_08-49-28.png)
-
-- 夜莺存档了历史告警事件，支持多维度的查询和统计
-- 支持灵活的聚合分组，一目了然看到公司的告警事件分布情况
-
-![夜莺集成中心](doc/img/readme/2025-05-23_18-46-06.png)
-
-- 夜莺内置常用操作系统、中间件、数据库的的指标说明、仪表盘、告警规则，不过都是社区贡献的，整体也是参差不齐
-- 夜莺直接接收 Remote Write、OpenTSDB、Datadog、Falcon 等多种协议的数据，故而可以和各类 Agent 对接
-- 夜莺支持 Prometheus、ElasticSearch、Loki、TDEngine 等多种数据源，可以对其中的数据做告警
-- 夜莺可以很方便内嵌企业内部系统，比如 Grafana、CMDB 等，甚至可以配置这些内嵌系统的菜单可见性
+## 截图演示
 
 
-![夜莺仪表盘](doc/img/readme/2025-05-23_18-49-02.png)
+你可以在页面的右上角，切换语言和主题，目前我们支持英语、简体中文、繁体中文。
 
-- 夜莺支持仪表盘功能，支持常见的图表类型，也内置了一些仪表盘，上图是其中一个仪表盘的截图。
-- 如果你已经习惯了 Grafana，建议仍然使用 Grafana 看图。Grafana 在看图方面道行更深。
-- 机器相关的监控数据，如果是 Categraf 采集的，建议使用夜莺自带的仪表盘查看，因为 Categraf 的指标命名 Follow 的是 Telegraf 的命名方式，和 Node Exporter 不同
-- 因为夜莺有个业务组的概念，机器可以归属不同的业务组，有时在仪表盘里只想查看当前所属业务组的机器，所以夜莺的仪表盘可以和业务组联动
+![语言切换](https://download.flashcat.cloud/ulric/n9e-switch-i18n.png)
+
+即时查询，类似 Prometheus 内置的查询分析页面，做 ad-hoc 查询，夜莺做了一些 UI 优化，同时提供了一些内置 promql 指标，让不太了解 promql 的用户也可以快速查询。
+
+![即时查询](https://download.flashcat.cloud/ulric/20240513103305.png)
+
+当然，也可以直接通过指标视图查看，有了指标视图，即时查询基本可以不用了，或者只有高端玩家使用即时查询，普通用户直接通过指标视图查询即可。
+
+![指标视图](https://download.flashcat.cloud/ulric/20240513103530.png)
+
+夜莺内置了常用仪表盘，可以直接导入使用。也可以导入 Grafana 仪表盘，不过只能兼容 Grafana 基本图表，如果已经习惯了 Grafana 建议继续使用 Grafana 看图，把夜莺作为一个告警引擎使用。
+
+![内置仪表盘](https://download.flashcat.cloud/ulric/20240513103628.png)
+
+除了内置的仪表盘，也内置了很多告警规则，开箱即用。
+
+![内置告警规则](https://download.flashcat.cloud/ulric/20240513103825.png)
+
+
+
+## 产品架构
+
+社区使用夜莺最多的场景就是使用夜莺做告警引擎，对接多套时序库，统一告警规则管理。绘图仍然使用 Grafana 居多。作为一个告警引擎，夜莺的产品架构如下：
+
+![产品架构](https://download.flashcat.cloud/ulric/20240221152601.png)
+
+对于个别边缘机房，如果和中心夜莺服务端网络链路不好，希望提升告警可用性，我们也提供边缘机房告警引擎下沉部署模式，这个模式下，即便网络割裂，告警功能也不受影响。
+
+![边缘部署模式](https://download.flashcat.cloud/ulric/20240222102119.png)
+
+
+## 交流渠道
+- 报告Bug，优先推荐提交[夜莺GitHub Issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
+- 推荐完整浏览[夜莺文档站点](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v7/introduction/)，了解更多信息
+- 推荐搜索关注夜莺公众号，第一时间获取社区动态：`夜莺监控Nightingale`
+- 日常问题交流：
+  - QQ群：730841964
+  - [加入微信群](https://download.flashcat.cloud/ulric/20241022141621.png)，如果二维码过期了，可以联系我（我的微信：`picobyte`）拉群，备注： `夜莺互助群`
 
 ## 广受关注
 [![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)
 
-## 感谢众多企业的信赖
-
-![夜莺客户](doc/img/readme/logos.png)
-
 ## 社区共建
 - ❇️ 请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
 - ❤️ 夜莺贡献者

README_en.md

@@ -29,7 +29,7 @@
 
 ## What is Nightingale
 
-Nightingale is an open-source project focused on alerting. Similar to Grafana's data source integration approach, Nightingale also connects with various existing data sources. However, while Grafana focuses on visualization, Nightingale focuses on alerting engines.
+Nightingale aims to combine the advantages of Prometheus and Grafana. It manages alert rules and visualizes metrics, logs, traces in a beautiful WebUI.
 
 Originally developed and open-sourced by Didi, Nightingale was donated to the China Computer Federation Open Source Development Committee (CCF ODC) on May 11, 2022, becoming the first open-source project accepted by the CCF ODC after its establishment. 
 
@@ -53,31 +53,31 @@ Originally developed and open-sourced by Didi, Nightingale was donated to the Ch
 
 You can switch languages and themes in the top right corner. We now support English, Simplified Chinese, and Traditional Chinese. 
 
-![18n switch](doc/img/readme/n9e-switch-i18n.png)
+![18n switch](https://download.flashcat.cloud/ulric/n9e-switch-i18n.png)
 
 ### Instant Query
 
 Similar to the built-in query analysis page in Prometheus, Nightingale offers an ad-hoc query feature with UI enhancements. It also provides built-in PromQL metrics, allowing users unfamiliar with PromQL to quickly perform queries.
 
-![Instant Query](doc/img/readme/20240513103305.png)
+![Instant Query](https://download.flashcat.cloud/ulric/20240513103305.png)
 
 ### Metric View
 
 Alternatively, you can use the Metric View to access data. With this feature, Instant Query becomes less necessary, as it caters more to advanced users. Regular users can easily perform queries using the Metric View.
 
-![Metric View](doc/img/readme/20240513103530.png)
+![Metric View](https://download.flashcat.cloud/ulric/20240513103530.png)
 
 ### Built-in Dashboards
 
 Nightingale includes commonly used dashboards that can be imported and used directly. You can also import Grafana dashboards, although compatibility is limited to basic Grafana charts. If you’re accustomed to Grafana, it’s recommended to continue using it for visualization, with Nightingale serving as an alerting engine.
 
-![Built-in Dashboards](doc/img/readme/20240513103628.png)
+![Built-in Dashboards](https://download.flashcat.cloud/ulric/20240513103628.png)
 
 ### Built-in Alert Rules
 
 In addition to the built-in dashboards, Nightingale also comes with numerous alert rules that are ready to use out of the box.
 
-![Built-in Alert Rules](doc/img/readme/20240513103825.png)
+![Built-in Alert Rules](https://download.flashcat.cloud/ulric/20240513103825.png)
 
 
 
@@ -85,11 +85,11 @@ In addition to the built-in dashboards, Nightingale also comes with numerous ale
 
 In most community scenarios, Nightingale is primarily used as an alert engine, integrating with multiple time-series databases to unify alert rule management. Grafana remains the preferred tool for visualization. As an alert engine, the product architecture of Nightingale is as follows:
 
-![Product Architecture](doc/img/readme/20240221152601.png)
+![Product Architecture](https://download.flashcat.cloud/ulric/20240221152601.png)
 
 For certain edge data centers with poor network connectivity to the central Nightingale server, we offer a distributed deployment mode for the alert engine. In this mode, even if the network is disconnected, the alerting functionality remains unaffected.
 
-![Edge Deployment Mode](doc/img/readme/20240222102119.png)
+![Edge Deployment Mode](https://download.flashcat.cloud/ulric/20240222102119.png)
 
 
 ## Communication Channels

alert/alert.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ccfos/nightingale/v6/dscache"
-
 	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
@@ -23,11 +21,12 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
 	"github.com/ccfos/nightingale/v6/pkg/logx"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
+	"github.com/ccfos/nightingale/v6/tdengine"
+
 	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )
 
@@ -64,18 +63,14 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	taskTplsCache := memsto.NewTaskTplCache(ctx)
 	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
-	notifyRuleCache := memsto.NewNotifyRuleCache(ctx, syncStats)
-	notifyChannelCache := memsto.NewNotifyChannelCache(ctx, syncStats)
-	messageTemplateCache := memsto.NewMessageTemplateCache(ctx, syncStats)
 
 	promClients := prom.NewPromClient(ctx)
 	dispatch.InitRegisterQueryFunc(promClients)
+	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 
 	externalProcessors := process.NewExternalProcessors()
 
-	macros.RegisterMacro(macros.MacroInVain)
-	dscache.Init(ctx, false)
-	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)
+	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
 
 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP,
 		configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
@@ -98,14 +93,12 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, alertStats *astats.Stats, externalProcessors *process.ExternalProcessorsType, targetCache *memsto.TargetCacheType, busiGroupCache *memsto.BusiGroupCacheType,
 	alertMuteCache *memsto.AlertMuteCacheType, alertRuleCache *memsto.AlertRuleCacheType, notifyConfigCache *memsto.NotifyConfigCacheType, taskTplsCache *memsto.TaskTplCache, datasourceCache *memsto.DatasourceCacheType, ctx *ctx.Context,
-	promClients *prom.PromClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, messageTemplateCache *memsto.MessageTemplateCacheType) {
+	promClients *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) {
 	alertSubscribeCache := memsto.NewAlertSubscribeCache(ctx, syncStats)
 	recordingRuleCache := memsto.NewRecordingRuleCache(ctx, syncStats)
 	targetsOfAlertRulesCache := memsto.NewTargetOfAlertRuleCache(ctx, alertc.Heartbeat.EngineName, syncStats)
 
 	go models.InitNotifyConfig(ctx, alertc.Alerting.TemplatesDir)
-	go models.InitNotifyChannel(ctx)
-	go models.InitMessageTemplate(ctx)
 
 	naming := naming.NewNaming(ctx, alertc.Heartbeat, alertStats)
 
@@ -113,20 +106,14 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats, datasourceCache)
 
 	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, targetsOfAlertRulesCache,
-		busiGroupCache, alertMuteCache, datasourceCache, promClients, naming, ctx, alertStats)
+		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)
 
-	eventProcessorCache := memsto.NewEventProcessorCache(ctx, syncStats)
-
-	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, eventProcessorCache, alertc.Alerting, ctx, alertStats)
+	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, alertc.Alerting, ctx, alertStats)
 	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp, promClients)
 
-	notifyRecordComsumer := sender.NewNotifyRecordConsumer(ctx)
-
 	go dp.ReloadTpls()
 	go consumer.LoopConsume()
-	go notifyRecordComsumer.LoopConsume()
 
 	go queue.ReportQueueSize(alertStats)
-	go sender.ReportNotifyRecordQueueSize(alertStats)
 	go sender.InitEmailSender(ctx, notifyConfigCache)
 }

alert/astats/stats.go

@@ -17,16 +17,12 @@ type Stats struct {
 	CounterRuleEval             *prometheus.CounterVec
 	CounterQueryDataErrorTotal  *prometheus.CounterVec
 	CounterQueryDataTotal       *prometheus.CounterVec
-	CounterVarFillingQuery      *prometheus.CounterVec
 	CounterRecordEval           *prometheus.CounterVec
 	CounterRecordEvalErrorTotal *prometheus.CounterVec
 	CounterMuteTotal            *prometheus.CounterVec
 	CounterRuleEvalErrorTotal   *prometheus.CounterVec
 	CounterHeartbeatErrorTotal  *prometheus.CounterVec
 	CounterSubEventTotal        *prometheus.CounterVec
-	GaugeQuerySeriesCount       *prometheus.GaugeVec
-	GaugeRuleEvalDuration       *prometheus.GaugeVec
-	GaugeNotifyRecordQueueSize  prometheus.Gauge
 }
 
 func NewSyncStats() *Stats {
@@ -56,7 +52,7 @@ func NewSyncStats() *Stats {
 		Subsystem: subsystem,
 		Name:      "query_data_total",
 		Help:      "Number of rule eval query data.",
-	}, []string{"datasource", "rule_id"})
+	}, []string{"datasource"})
 
 	CounterRecordEval := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,
@@ -107,7 +103,7 @@ func NewSyncStats() *Stats {
 		Subsystem: subsystem,
 		Name:      "mute_total",
 		Help:      "Number of mute.",
-	}, []string{"group", "rule_id", "mute_rule_id", "datasource_id"})
+	}, []string{"group"})
 
 	CounterSubEventTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,
@@ -123,34 +119,6 @@ func NewSyncStats() *Stats {
 		Help:      "Number of heartbeat error.",
 	}, []string{})
 
-	GaugeQuerySeriesCount := prometheus.NewGaugeVec(prometheus.GaugeOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "eval_query_series_count",
-		Help:      "Number of series retrieved from data source after query.",
-	}, []string{"rule_id", "datasource_id", "ref"})
-	// 通知记录队列的长度
-	GaugeNotifyRecordQueueSize := prometheus.NewGauge(prometheus.GaugeOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "notify_record_queue_size",
-		Help:      "The size of notify record queue.",
-	})
-
-	GaugeRuleEvalDuration := prometheus.NewGaugeVec(prometheus.GaugeOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "rule_eval_duration_ms",
-		Help:      "Duration of rule eval in milliseconds.",
-	}, []string{"rule_id", "datasource_id"})
-
-	CounterVarFillingQuery := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "var_filling_query_total",
-		Help:      "Number of var filling query.",
-	}, []string{"rule_id", "datasource_id", "ref", "typ"})
-
 	prometheus.MustRegister(
 		CounterAlertsTotal,
 		GaugeAlertQueueSize,
@@ -165,10 +133,6 @@ func NewSyncStats() *Stats {
 		CounterRuleEvalErrorTotal,
 		CounterHeartbeatErrorTotal,
 		CounterSubEventTotal,
-		GaugeQuerySeriesCount,
-		GaugeRuleEvalDuration,
-		GaugeNotifyRecordQueueSize,
-		CounterVarFillingQuery,
 	)
 
 	return &Stats{
@@ -185,9 +149,5 @@ func NewSyncStats() *Stats {
 		CounterRuleEvalErrorTotal:   CounterRuleEvalErrorTotal,
 		CounterHeartbeatErrorTotal:  CounterHeartbeatErrorTotal,
 		CounterSubEventTotal:        CounterSubEventTotal,
-		GaugeQuerySeriesCount:       GaugeQuerySeriesCount,
-		GaugeRuleEvalDuration:       GaugeRuleEvalDuration,
-		GaugeNotifyRecordQueueSize:  GaugeNotifyRecordQueueSize,
-		CounterVarFillingQuery:      CounterVarFillingQuery,
 	}
 }

alert/dispatch/dispatch.go

@@ -3,8 +3,6 @@ package dispatch
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"html/template"
 	"net/url"
 	"strconv"
@@ -15,7 +13,6 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/common"
-	"github.com/ccfos/nightingale/v6/alert/pipeline"
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
@@ -33,11 +30,6 @@ type Dispatch struct {
 	notifyConfigCache   *memsto.NotifyConfigCacheType
 	taskTplsCache       *memsto.TaskTplCache
 
-	notifyRuleCache      *memsto.NotifyRuleCacheType
-	notifyChannelCache   *memsto.NotifyChannelCacheType
-	messageTemplateCache *memsto.MessageTemplateCacheType
-	eventProcessorCache  *memsto.EventProcessorCacheType
-
 	alerting aconf.Alerting
 
 	Senders          map[string]sender.Sender
@@ -55,20 +47,15 @@ type Dispatch struct {
 // 创建一个 Notify 实例
 func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType,
 	alertSubscribeCache *memsto.AlertSubscribeCacheType, targetCache *memsto.TargetCacheType, notifyConfigCache *memsto.NotifyConfigCacheType,
-	taskTplsCache *memsto.TaskTplCache, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType,
-	messageTemplateCache *memsto.MessageTemplateCacheType, eventProcessorCache *memsto.EventProcessorCacheType, alerting aconf.Alerting, ctx *ctx.Context, astats *astats.Stats) *Dispatch {
+	taskTplsCache *memsto.TaskTplCache, alerting aconf.Alerting, ctx *ctx.Context, astats *astats.Stats) *Dispatch {
 	notify := &Dispatch{
-		alertRuleCache:       alertRuleCache,
-		userCache:            userCache,
-		userGroupCache:       userGroupCache,
-		alertSubscribeCache:  alertSubscribeCache,
-		targetCache:          targetCache,
-		notifyConfigCache:    notifyConfigCache,
-		taskTplsCache:        taskTplsCache,
-		notifyRuleCache:      notifyRuleCache,
-		notifyChannelCache:   notifyChannelCache,
-		messageTemplateCache: messageTemplateCache,
-		eventProcessorCache:  eventProcessorCache,
+		alertRuleCache:      alertRuleCache,
+		userCache:           userCache,
+		userGroupCache:      userGroupCache,
+		alertSubscribeCache: alertSubscribeCache,
+		targetCache:         targetCache,
+		notifyConfigCache:   notifyConfigCache,
+		taskTplsCache:       taskTplsCache,
 
 		alerting: alerting,
 
@@ -80,13 +67,11 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		ctx:    ctx,
 		Astats: astats,
 	}
-
-	pipeline.Init()
 	return notify
 }
 
 func (e *Dispatch) ReloadTpls() error {
-	err := e.reloadTpls()
+	err := e.relaodTpls()
 	if err != nil {
 		logger.Errorf("failed to reload tpls: %v", err)
 	}
@@ -94,13 +79,13 @@ func (e *Dispatch) ReloadTpls() error {
 	duration := time.Duration(9000) * time.Millisecond
 	for {
 		time.Sleep(duration)
-		if err := e.reloadTpls(); err != nil {
+		if err := e.relaodTpls(); err != nil {
 			logger.Warning("failed to reload tpls:", err)
 		}
 	}
 }
 
-func (e *Dispatch) reloadTpls() error {
+func (e *Dispatch) relaodTpls() error {
 	tmpTpls, err := models.ListTpls(e.ctx)
 	if err != nil {
 		return err
@@ -146,354 +131,6 @@ func (e *Dispatch) reloadTpls() error {
 	return nil
 }
 
-func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent) {
-
-	if len(eventOrigin.NotifyRuleIds) > 0 {
-		for _, notifyRuleId := range eventOrigin.NotifyRuleIds {
-			// 深拷贝新的 event，避免并发修改 event 冲突
-			eventCopy := eventOrigin.DeepCopy()
-
-			logger.Infof("notify rule ids: %v, event: %+v", notifyRuleId, eventCopy)
-			notifyRule := e.notifyRuleCache.Get(notifyRuleId)
-			if notifyRule == nil {
-				continue
-			}
-
-			if !notifyRule.Enable {
-				continue
-			}
-
-			var processors []models.Processor
-			for _, pipelineConfig := range notifyRule.PipelineConfigs {
-				if !pipelineConfig.Enable {
-					continue
-				}
-
-				eventPipeline := e.eventProcessorCache.Get(pipelineConfig.PipelineId)
-				if eventPipeline == nil {
-					logger.Warningf("notify_id: %d, event:%+v, processor not found", notifyRuleId, eventCopy)
-					continue
-				}
-
-				if !pipelineApplicable(eventPipeline, eventCopy) {
-					logger.Debugf("notify_id: %d, event:%+v, pipeline_id: %d, not applicable", notifyRuleId, eventCopy, pipelineConfig.PipelineId)
-					continue
-				}
-
-				processors = append(processors, e.eventProcessorCache.GetProcessorsById(pipelineConfig.PipelineId)...)
-			}
-
-			for _, processor := range processors {
-				logger.Infof("before processor notify_id: %d, event:%+v, processor:%+v", notifyRuleId, eventCopy, processor)
-				eventCopy, res, err := processor.Process(e.ctx, eventCopy)
-				logger.Infof("after processor notify_id: %d, event:%+v, processor:%+v, res:%v, err:%v", notifyRuleId, eventCopy, processor, res, err)
-				if eventCopy == nil {
-					logger.Warningf("notify_id: %d, event:%+v, processor:%+v, event is nil", notifyRuleId, eventCopy, processor)
-					break
-				}
-			}
-
-			if eventCopy == nil {
-				// 如果 eventCopy 为 nil，说明 eventCopy 被 processor drop 掉了, 不再发送通知
-				continue
-			}
-
-			// notify
-			for i := range notifyRule.NotifyConfigs {
-				if !NotifyRuleApplicable(&notifyRule.NotifyConfigs[i], eventCopy) {
-					continue
-				}
-				notifyChannel := e.notifyChannelCache.Get(notifyRule.NotifyConfigs[i].ChannelID)
-				messageTemplate := e.messageTemplateCache.Get(notifyRule.NotifyConfigs[i].TemplateID)
-				if notifyChannel == nil {
-					sender.NotifyRecord(e.ctx, []*models.AlertCurEvent{eventCopy}, notifyRuleId, fmt.Sprintf("notify_channel_id:%d", notifyRule.NotifyConfigs[i].ChannelID), "", "", errors.New("notify_channel not found"))
-					logger.Warningf("notify_id: %d, event:%+v, channel_id:%d, template_id: %d, notify_channel not found", notifyRuleId, eventCopy, notifyRule.NotifyConfigs[i].ChannelID, notifyRule.NotifyConfigs[i].TemplateID)
-					continue
-				}
-
-				if notifyChannel.RequestType != "flashduty" && messageTemplate == nil {
-					logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, template_id: %d, message_template not found", notifyRuleId, notifyChannel.Ident, eventCopy, notifyRule.NotifyConfigs[i].TemplateID)
-					sender.NotifyRecord(e.ctx, []*models.AlertCurEvent{eventCopy}, notifyRuleId, notifyChannel.Name, "", "", errors.New("message_template not found"))
-
-					continue
-				}
-
-				// todo go send
-				// todo 聚合 event
-				go e.sendV2([]*models.AlertCurEvent{eventCopy}, notifyRuleId, &notifyRule.NotifyConfigs[i], notifyChannel, messageTemplate)
-			}
-		}
-	}
-}
-
-func pipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEvent) bool {
-	if pipeline == nil {
-		return true
-	}
-
-	if !pipeline.FilterEnable {
-		return true
-	}
-
-	tagMatch := true
-	if len(pipeline.LabelFilters) > 0 {
-		for i := range pipeline.LabelFilters {
-			if pipeline.LabelFilters[i].Func == "" {
-				pipeline.LabelFilters[i].Func = pipeline.LabelFilters[i].Op
-			}
-		}
-
-		tagFilters, err := models.ParseTagFilter(pipeline.LabelFilters)
-		if err != nil {
-			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%+v pipeline:%+v", err, event, pipeline)
-			return false
-		}
-		tagMatch = common.MatchTags(event.TagsMap, tagFilters)
-	}
-
-	attributesMatch := true
-	if len(pipeline.AttrFilters) > 0 {
-		tagFilters, err := models.ParseTagFilter(pipeline.AttrFilters)
-		if err != nil {
-			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%+v pipeline:%+v err:%v", tagFilters, event, pipeline, err)
-			return false
-		}
-
-		attributesMatch = common.MatchTags(event.JsonTagsAndValue(), tagFilters)
-	}
-
-	return tagMatch && attributesMatch
-}
-
-func NotifyRuleApplicable(notifyConfig *models.NotifyConfig, event *models.AlertCurEvent) bool {
-	tm := time.Unix(event.TriggerTime, 0)
-	triggerTime := tm.Format("15:04")
-	triggerWeek := int(tm.Weekday())
-
-	timeMatch := false
-
-	if len(notifyConfig.TimeRanges) == 0 {
-		timeMatch = true
-	}
-	for j := range notifyConfig.TimeRanges {
-		if timeMatch {
-			break
-		}
-		enableStime := notifyConfig.TimeRanges[j].Start
-		enableEtime := notifyConfig.TimeRanges[j].End
-		enableDaysOfWeek := notifyConfig.TimeRanges[j].Week
-		length := len(enableDaysOfWeek)
-		// enableStime,enableEtime,enableDaysOfWeek三者长度肯定相同，这里循环一个即可
-		for i := 0; i < length; i++ {
-			if enableDaysOfWeek[i] != triggerWeek {
-				continue
-			}
-
-			if enableStime < enableEtime {
-				if enableEtime == "23:59" {
-					// 02:00-23:59，这种情况做个特殊处理，相当于左闭右闭区间了
-					if triggerTime < enableStime {
-						// mute, 即没生效
-						continue
-					}
-				} else {
-					// 02:00-04:00 或者 02:00-24:00
-					if triggerTime < enableStime || triggerTime >= enableEtime {
-						// mute, 即没生效
-						continue
-					}
-				}
-			} else if enableStime > enableEtime {
-				// 21:00-09:00
-				if triggerTime < enableStime && triggerTime >= enableEtime {
-					// mute, 即没生效
-					continue
-				}
-			}
-
-			// 到这里说明当前时刻在告警规则的某组生效时间范围内，即没有 mute，直接返回 false
-			timeMatch = true
-			break
-		}
-	}
-
-	severityMatch := false
-	for i := range notifyConfig.Severities {
-		if notifyConfig.Severities[i] == event.Severity {
-			severityMatch = true
-		}
-	}
-
-	tagMatch := true
-	if len(notifyConfig.LabelKeys) > 0 {
-		for i := range notifyConfig.LabelKeys {
-			if notifyConfig.LabelKeys[i].Func == "" {
-				notifyConfig.LabelKeys[i].Func = notifyConfig.LabelKeys[i].Op
-			}
-		}
-
-		tagFilters, err := models.ParseTagFilter(notifyConfig.LabelKeys)
-		if err != nil {
-			logger.Errorf("notify send failed to parse tag filter: %v event:%+v notify_config:%+v", err, event, notifyConfig)
-			return false
-		}
-		tagMatch = common.MatchTags(event.TagsMap, tagFilters)
-	}
-
-	attributesMatch := true
-	if len(notifyConfig.Attributes) > 0 {
-		tagFilters, err := models.ParseTagFilter(notifyConfig.Attributes)
-		if err != nil {
-			logger.Errorf("notify send failed to parse tag filter: %v event:%+v notify_config:%+v err:%v", tagFilters, event, notifyConfig, err)
-			return false
-		}
-
-		attributesMatch = common.MatchTags(event.JsonTagsAndValue(), tagFilters)
-	}
-	logger.Infof("notify send timeMatch:%v severityMatch:%v tagMatch:%v attributesMatch:%v event:%+v notify_config:%+v", timeMatch, severityMatch, tagMatch, attributesMatch, event, notifyConfig)
-	return timeMatch && severityMatch && tagMatch && attributesMatch
-}
-
-func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) ([]string, []int64, map[string]string) {
-	customParams := make(map[string]string)
-	var flashDutyChannelIDs []int64
-	var userInfoParams models.CustomParams
-
-	for key, value := range notifyConfig.Params {
-		switch key {
-		case "user_ids", "user_group_ids", "ids":
-			if data, err := json.Marshal(value); err == nil {
-				var ids []int64
-				if json.Unmarshal(data, &ids) == nil {
-					if key == "user_ids" {
-						userInfoParams.UserIDs = ids
-					} else if key == "user_group_ids" {
-						userInfoParams.UserGroupIDs = ids
-					} else if key == "ids" {
-						flashDutyChannelIDs = ids
-					}
-				}
-			}
-		default:
-			customParams[key] = value.(string)
-		}
-	}
-
-	if len(userInfoParams.UserIDs) == 0 && len(userInfoParams.UserGroupIDs) == 0 {
-		return []string{}, flashDutyChannelIDs, customParams
-	}
-
-	userIds := make([]int64, 0)
-	userIds = append(userIds, userInfoParams.UserIDs...)
-
-	if len(userInfoParams.UserGroupIDs) > 0 {
-		userGroups := userGroupCache.GetByUserGroupIds(userInfoParams.UserGroupIDs)
-		for _, userGroup := range userGroups {
-			userIds = append(userIds, userGroup.UserIds...)
-		}
-	}
-
-	users := userCache.GetByUserIds(userIds)
-	visited := make(map[int64]bool)
-	sendtos := make([]string, 0)
-	for _, user := range users {
-		if visited[user.Id] {
-			continue
-		}
-		var sendto string
-		if contactKey == "phone" {
-			sendto = user.Phone
-		} else if contactKey == "email" {
-			sendto = user.Email
-		} else {
-			sendto, _ = user.ExtractToken(contactKey)
-		}
-
-		if sendto == "" {
-			continue
-		}
-		sendtos = append(sendtos, sendto)
-		visited[user.Id] = true
-	}
-
-	return sendtos, flashDutyChannelIDs, customParams
-}
-
-func (e *Dispatch) sendV2(events []*models.AlertCurEvent, notifyRuleId int64, notifyConfig *models.NotifyConfig, notifyChannel *models.NotifyChannelConfig, messageTemplate *models.MessageTemplate) {
-	if len(events) == 0 {
-		logger.Errorf("notify_id: %d events is empty", notifyRuleId)
-		return
-	}
-
-	tplContent := make(map[string]interface{})
-	if notifyChannel.RequestType != "flashduty" {
-		tplContent = messageTemplate.RenderEvent(events)
-	}
-
-	var contactKey string
-	if notifyChannel.ParamConfig != nil && notifyChannel.ParamConfig.UserInfo != nil {
-		contactKey = notifyChannel.ParamConfig.UserInfo.ContactKey
-	}
-
-	sendtos, flashDutyChannelIDs, customParams := GetNotifyConfigParams(notifyConfig, contactKey, e.userCache, e.userGroupCache)
-
-	e.Astats.GaugeNotifyRecordQueueSize.Inc()
-	defer e.Astats.GaugeNotifyRecordQueueSize.Dec()
-
-	switch notifyChannel.RequestType {
-	case "flashduty":
-		if len(flashDutyChannelIDs) == 0 {
-			flashDutyChannelIDs = []int64{0} // 如果 flashduty 通道没有配置，则使用 0, 给 SendFlashDuty 判断使用, 不给 flashduty 传 channel_id 参数
-		}
-
-		for i := range flashDutyChannelIDs {
-			respBody, err := notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
-			logger.Infof("notify_id: %d, channel_name: %v, event:%+v, IntegrationUrl: %v dutychannel_id: %v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], notifyChannel.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, flashDutyChannelIDs[i], respBody, err)
-			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, strconv.FormatInt(flashDutyChannelIDs[i], 10), respBody, err)
-		}
-		return
-	case "http":
-		if e.notifyChannelCache.HttpConcurrencyAdd(notifyChannel.ID) {
-			defer e.notifyChannelCache.HttpConcurrencyDone(notifyChannel.ID)
-		}
-		if notifyChannel.RequestConfig == nil {
-			logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, request config not found", notifyRuleId, notifyChannel.Name, events[0])
-		}
-
-		if notifyChannel.RequestConfig.HTTPRequestConfig == nil {
-			logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, http request config not found", notifyRuleId, notifyChannel.Name, events[0])
-		}
-
-		if NeedBatchContacts(notifyChannel.RequestConfig.HTTPRequestConfig) || len(sendtos) == 0 {
-			resp, err := notifyChannel.SendHTTP(events, tplContent, customParams, sendtos, e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
-			logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, userInfo:%+v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, sendtos, resp, err)
-
-			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, sendtos), resp, err)
-		} else {
-			for i := range sendtos {
-				resp, err := notifyChannel.SendHTTP(events, tplContent, customParams, []string{sendtos[i]}, e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
-				logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, userInfo:%+v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, sendtos[i], resp, err)
-				sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, []string{sendtos[i]}), resp, err)
-			}
-		}
-
-	case "smtp":
-		notifyChannel.SendEmail(notifyRuleId, events, tplContent, sendtos, e.notifyChannelCache.GetSmtpClient(notifyChannel.ID))
-
-	case "script":
-		target, res, err := notifyChannel.SendScript(events, tplContent, customParams, sendtos)
-		logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, target:%s, res:%s, err:%v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, target, res, err)
-		sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, target, res, err)
-	default:
-		logger.Warningf("notify_id: %d, channel_name: %v, event:%+v send type not found", notifyRuleId, notifyChannel.Name, events[0])
-	}
-}
-
-func NeedBatchContacts(requestConfig *models.HTTPRequestConfig) bool {
-	b, _ := json.Marshal(requestConfig)
-	return strings.Contains(string(b), "$sendtos")
-}
-
 // HandleEventNotify 处理event事件的主逻辑
 // event: 告警/恢复事件
 // isSubscribe: 告警事件是否由subscribe的配置产生
@@ -503,6 +140,11 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 		return
 	}
 
+	if e.blockEventNotify(rule, event) {
+		logger.Infof("block event notify: rule_id:%d event:%+v", rule.Id, event)
+		return
+	}
+
 	fillUsers(event, e.userCache, e.userGroupCache)
 
 	var (
@@ -530,7 +172,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 		notifyTarget.AndMerge(handler(rule, event, notifyTarget, e))
 	}
 
-	go e.HandleEventWithNotifyRule(event)
+	// 处理事件发送,这里用一个goroutine处理一个event的所有发送事件
 	go e.Send(rule, event, notifyTarget, isSubscribe)
 
 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
@@ -539,6 +181,25 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}
 }
 
+func (e *Dispatch) blockEventNotify(rule *models.AlertRule, event *models.AlertCurEvent) bool {
+	ruleType := rule.GetRuleType()
+
+	// 若为机器则先看机器是否删除
+	if ruleType == models.HOST {
+		host, ok := e.targetCache.Get(event.TagsMap["ident"])
+		if !ok || host == nil {
+			return true
+		}
+	}
+
+	// 恢复通知，检测规则配置是否改变
+	// if event.IsRecovered && event.RuleHash != rule.Hash() {
+	// 	return true
+	// }
+
+	return false
+}
+
 func (e *Dispatch) handleSubs(event *models.AlertCurEvent) {
 	// handle alert subscribes
 	subscribes := make([]*models.AlertSubscribe, 0)
@@ -708,11 +369,6 @@ func (e *Dispatch) HandleIbex(rule *models.AlertRule, event *models.AlertCurEven
 	}
 	json.Unmarshal([]byte(rule.RuleConfig), &ruleConfig)
 
-	if event.IsRecovered {
-		// 恢复事件不需要走故障自愈的逻辑
-		return
-	}
-
 	for _, t := range ruleConfig.TaskTpls {
 		if t.TplId == 0 {
 			continue
@@ -791,22 +447,3 @@ func mapKeys(m map[int64]struct{}) []int64 {
 	}
 	return lst
 }
-
-func getSendTarget(customParams map[string]string, sendtos []string) string {
-	if len(customParams) == 0 {
-		return strings.Join(sendtos, ",")
-	}
-
-	values := make([]string, 0)
-	for _, value := range customParams {
-		runes := []rune(value)
-		if len(runes) <= 4 {
-			values = append(values, value)
-		} else {
-			maskedValue := string(runes[:len(runes)-4]) + "****"
-			values = append(values, maskedValue)
-		}
-	}
-
-	return strings.Join(values, ",")
-}

alert/dispatch/log.go

@@ -18,13 +18,12 @@ func LogEvent(event *models.AlertCurEvent, location string, err ...error) {
 	}
 
 	logger.Infof(
-		"event(%s %s) %s: rule_id=%d sub_id:%d notify_rule_ids:%v cluster:%s %v%s@%d %s",
+		"event(%s %s) %s: rule_id=%d sub_id:%d cluster:%s %v%s@%d %s",
 		event.Hash,
 		status,
 		location,
 		event.RuleId,
 		event.SubRuleId,
-		event.NotifyRuleIds,
 		event.Cluster,
 		event.TagsJSON,
 		event.TriggerValue,

alert/eval/alert_rule.go

@@ -10,10 +10,11 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/naming"
 	"github.com/ccfos/nightingale/v6/alert/process"
-	"github.com/ccfos/nightingale/v6/datasource/commons/eslike"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/prom"
+	"github.com/ccfos/nightingale/v6/tdengine"
+
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -32,7 +33,8 @@ type Scheduler struct {
 	alertMuteCache          *memsto.AlertMuteCacheType
 	datasourceCache         *memsto.DatasourceCacheType
 
-	promClients *prom.PromClientMap
+	promClients     *prom.PromClientMap
+	tdengineClients *tdengine.TdengineClientMap
 
 	naming *naming.Naming
 
@@ -43,7 +45,7 @@ type Scheduler struct {
 func NewScheduler(aconf aconf.Alert, externalProcessors *process.ExternalProcessorsType, arc *memsto.AlertRuleCacheType,
 	targetCache *memsto.TargetCacheType, toarc *memsto.TargetsOfAlertRuleCacheType,
 	busiGroupCache *memsto.BusiGroupCacheType, alertMuteCache *memsto.AlertMuteCacheType, datasourceCache *memsto.DatasourceCacheType,
-	promClients *prom.PromClientMap, naming *naming.Naming, ctx *ctx.Context, stats *astats.Stats) *Scheduler {
+	promClients *prom.PromClientMap, tdengineClients *tdengine.TdengineClientMap, naming *naming.Naming, ctx *ctx.Context, stats *astats.Stats) *Scheduler {
 	scheduler := &Scheduler{
 		aconf:      aconf,
 		alertRules: make(map[string]*AlertRuleWorker),
@@ -57,13 +59,13 @@ func NewScheduler(aconf aconf.Alert, externalProcessors *process.ExternalProcess
 		alertMuteCache:          alertMuteCache,
 		datasourceCache:         datasourceCache,
 
-		promClients: promClients,
-		naming:      naming,
+		promClients:     promClients,
+		tdengineClients: tdengineClients,
+		naming:          naming,
 
 		ctx:   ctx,
 		stats: stats,
 	}
-	eslike.SetEsIndexPatternCacheType(memsto.NewEsIndexPatternCacheType(ctx))
 
 	go scheduler.LoopSyncRules(context.Background())
 	return scheduler
@@ -93,7 +95,7 @@ func (s *Scheduler) syncAlertRules() {
 		}
 
 		ruleType := rule.GetRuleType()
-		if rule.IsPrometheusRule() || rule.IsInnerRule() {
+		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() {
 			datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
 			for _, dsId := range datasourceIds {
 				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
@@ -116,7 +118,7 @@ func (s *Scheduler) syncAlertRules() {
 				}
 				processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, dsId, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
 
-				alertRule := NewAlertRuleWorker(rule, dsId, processor, s.promClients, s.ctx)
+				alertRule := NewAlertRuleWorker(rule, dsId, processor, s.promClients, s.tdengineClients, s.ctx)
 				alertRuleWorkers[alertRule.Hash()] = alertRule
 			}
 		} else if rule.IsHostRule() {
@@ -125,7 +127,7 @@ func (s *Scheduler) syncAlertRules() {
 				continue
 			}
 			processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, 0, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
-			alertRule := NewAlertRuleWorker(rule, 0, processor, s.promClients, s.ctx)
+			alertRule := NewAlertRuleWorker(rule, 0, processor, s.promClients, s.tdengineClients, s.ctx)
 			alertRuleWorkers[alertRule.Hash()] = alertRule
 		} else {
 			// 如果 rule 不是通过 prometheus engine 来告警的，则创建为 externalRule
@@ -151,7 +153,6 @@ func (s *Scheduler) syncAlertRules() {
 	for hash, rule := range alertRuleWorkers {
 		if _, has := s.alertRules[hash]; !has {
 			rule.Prepare()
-			time.Sleep(time.Duration(20) * time.Millisecond)
 			rule.Start()
 			s.alertRules[hash] = rule
 		}

alert/mute/mute.go

@@ -12,29 +12,28 @@ import (
 	"github.com/toolkits/pkg/logger"
 )
 
-func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, alertMuteCache *memsto.AlertMuteCacheType) (bool, string, int64) {
+func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, alertMuteCache *memsto.AlertMuteCacheType) (bool, string) {
 	if rule.Disabled == 1 {
-		return true, "rule disabled", 0
+		return true, "rule disabled"
 	}
 
 	if TimeSpanMuteStrategy(rule, event) {
-		return true, "rule is not effective for period of time", 0
+		return true, "rule is not effective for period of time"
 	}
 
 	if IdentNotExistsMuteStrategy(rule, event, targetCache) {
-		return true, "ident not exists mute", 0
+		return true, "ident not exists mute"
 	}
 
 	if BgNotMatchMuteStrategy(rule, event, targetCache) {
-		return true, "bg not match mute", 0
+		return true, "bg not match mute"
 	}
 
-	hit, muteId := EventMuteStrategy(event, alertMuteCache)
-	if hit {
-		return true, "match mute rule", muteId
+	if EventMuteStrategy(event, alertMuteCache) {
+		return true, "match mute rule"
 	}
 
-	return false, "", 0
+	return false, ""
 }
 
 // TimeSpanMuteStrategy 根据规则配置的告警生效时间段过滤,如果产生的告警不在规则配置的告警生效时间段内,则不告警,即被mute
@@ -44,12 +43,6 @@ func TimeSpanMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent) b
 	triggerTime := tm.Format("15:04")
 	triggerWeek := strconv.Itoa(int(tm.Weekday()))
 
-	if rule.EnableDaysOfWeek == "" {
-		// 如果规则没有配置生效时间，则默认全天生效
-
-		return false
-	}
-
 	enableStime := strings.Fields(rule.EnableStime)
 	enableEtime := strings.Fields(rule.EnableEtime)
 	enableDaysOfWeek := strings.Split(rule.EnableDaysOfWeek, ";")
@@ -128,26 +121,30 @@ func BgNotMatchMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent,
 	return false
 }
 
-func EventMuteStrategy(event *models.AlertCurEvent, alertMuteCache *memsto.AlertMuteCacheType) (bool, int64) {
+func EventMuteStrategy(event *models.AlertCurEvent, alertMuteCache *memsto.AlertMuteCacheType) bool {
 	mutes, has := alertMuteCache.Gets(event.GroupId)
 	if !has || len(mutes) == 0 {
-		return false, 0
+		return false
 	}
 
 	for i := 0; i < len(mutes); i++ {
-		if MatchMute(event, mutes[i]) {
-			return true, mutes[i].Id
+		if matchMute(event, mutes[i]) {
+			return true
 		}
 	}
 
-	return false, 0
+	return false
 }
 
-// MatchMute 如果传入了clock这个可选参数，就表示使用这个clock表示的时间，否则就从event的字段中取TriggerTime
-func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int64) bool {
+// matchMute 如果传入了clock这个可选参数，就表示使用这个clock表示的时间，否则就从event的字段中取TriggerTime
+func matchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int64) bool {
 	if mute.Disabled == 1 {
 		return false
 	}
+	ts := event.TriggerTime
+	if len(clock) > 0 {
+		ts = clock[0]
+	}
 
 	// 如果不是全局的，判断 匹配的 datasource id
 	if len(mute.DatasourceIdsJson) != 0 && mute.DatasourceIdsJson[0] != 0 && event.DatasourceId != 0 {
@@ -162,21 +159,37 @@ func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 		}
 	}
 
+	var matchTime bool
 	if mute.MuteTimeType == models.TimeRange {
-		if !mute.IsWithinTimeRange(event.TriggerTime) {
+		if ts < mute.Btime || ts > mute.Etime {
 			return false
 		}
+		matchTime = true
 	} else if mute.MuteTimeType == models.Periodic {
-		ts := event.TriggerTime
-		if len(clock) > 0 {
-			ts = clock[0]
-		}
+		tm := time.Unix(event.TriggerTime, 0)
+		triggerTime := tm.Format("15:04")
+		triggerWeek := strconv.Itoa(int(tm.Weekday()))
 
-		if !mute.IsWithinPeriodicMute(ts) {
-			return false
+		for i := 0; i < len(mute.PeriodicMutesJson); i++ {
+			if strings.Contains(mute.PeriodicMutesJson[i].EnableDaysOfWeek, triggerWeek) {
+				if mute.PeriodicMutesJson[i].EnableStime == mute.PeriodicMutesJson[i].EnableEtime || (mute.PeriodicMutesJson[i].EnableStime == "00:00" && mute.PeriodicMutesJson[i].EnableEtime == "23:59") {
+					matchTime = true
+					break
+				} else if mute.PeriodicMutesJson[i].EnableStime < mute.PeriodicMutesJson[i].EnableEtime {
+					if triggerTime >= mute.PeriodicMutesJson[i].EnableStime && triggerTime < mute.PeriodicMutesJson[i].EnableEtime {
+						matchTime = true
+						break
+					}
+				} else {
+					if triggerTime >= mute.PeriodicMutesJson[i].EnableStime || triggerTime < mute.PeriodicMutesJson[i].EnableEtime {
+						matchTime = true
+						break
+					}
+				}
+			}
 		}
-	} else {
-		logger.Warningf("mute time type invalid, %d", mute.MuteTimeType)
+	}
+	if !matchTime {
 		return false
 	}
 

alert/pipeline/pipeline.go

@@ -1,12 +0,0 @@
-package pipeline
-
-import (
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/aisummary"
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/eventdrop"
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/eventupdate"
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/relabel"
-)
-
-func Init() {
-}

alert/pipeline/processor/aisummary/ai_summary.go

@@ -1,198 +0,0 @@
-package aisummary
-
-import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-)
-
-const (
-	HTTP_STATUS_SUCCESS_MAX = 299
-)
-
-// AISummaryConfig 配置结构体
-type AISummaryConfig struct {
-	callback.HTTPConfig
-	ModelName      string                 `json:"model_name"`
-	APIKey         string                 `json:"api_key"`
-	PromptTemplate string                 `json:"prompt_template"`
-	CustomParams   map[string]interface{} `json:"custom_params"`
-}
-
-type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
-}
-
-type ChatCompletionResponse struct {
-	Choices []struct {
-		Message struct {
-			Content string `json:"content"`
-		} `json:"message"`
-	} `json:"choices"`
-}
-
-func init() {
-	models.RegisterProcessor("ai_summary", &AISummaryConfig{})
-}
-
-func (c *AISummaryConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*AISummaryConfig](settings)
-	return result, err
-}
-
-func (c *AISummaryConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
-	if c.Client == nil {
-		if err := c.initHTTPClient(); err != nil {
-			return event, "", fmt.Errorf("failed to initialize HTTP client: %v processor: %v", err, c)
-		}
-	}
-
-	// 准备告警事件信息
-	eventInfo, err := c.prepareEventInfo(event)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to prepare event info: %v processor: %v", err, c)
-	}
-
-	// 调用AI模型生成总结
-	summary, err := c.generateAISummary(eventInfo)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to generate AI summary: %v processor: %v", err, c)
-	}
-
-	// 将总结添加到annotations字段
-	if event.AnnotationsJSON == nil {
-		event.AnnotationsJSON = make(map[string]string)
-	}
-	event.AnnotationsJSON["ai_summary"] = summary
-
-	// 更新Annotations字段
-	b, err := json.Marshal(event.AnnotationsJSON)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to marshal annotations: %v processor: %v", err, c)
-	}
-	event.Annotations = string(b)
-
-	return event, "", nil
-}
-
-func (c *AISummaryConfig) initHTTPClient() error {
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
-	}
-
-	if c.Proxy != "" {
-		proxyURL, err := url.Parse(c.Proxy)
-		if err != nil {
-			return fmt.Errorf("failed to parse proxy url: %v", err)
-		}
-		transport.Proxy = http.ProxyURL(proxyURL)
-	}
-
-	c.Client = &http.Client{
-		Timeout:   time.Duration(c.Timeout) * time.Millisecond,
-		Transport: transport,
-	}
-	return nil
-}
-
-func (c *AISummaryConfig) prepareEventInfo(event *models.AlertCurEvent) (string, error) {
-	var defs = []string{
-		"{{$event := .}}",
-	}
-
-	text := strings.Join(append(defs, c.PromptTemplate), "")
-	t, err := template.New("prompt").Funcs(template.FuncMap(tplx.TemplateFuncMap)).Parse(text)
-	if err != nil {
-		return "", fmt.Errorf("failed to parse prompt template: %v", err)
-	}
-
-	var body bytes.Buffer
-	err = t.Execute(&body, event)
-	if err != nil {
-		return "", fmt.Errorf("failed to execute prompt template: %v", err)
-	}
-
-	return body.String(), nil
-}
-
-func (c *AISummaryConfig) generateAISummary(eventInfo string) (string, error) {
-	// 构建基础请求参数
-	reqParams := map[string]interface{}{
-		"model": c.ModelName,
-		"messages": []Message{
-			{
-				Role:    "user",
-				Content: eventInfo,
-			},
-		},
-	}
-
-	// 合并自定义参数
-	for k, v := range c.CustomParams {
-		reqParams[k] = v
-	}
-
-	// 序列化请求体
-	jsonData, err := json.Marshal(reqParams)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal request body: %v", err)
-	}
-
-	// 创建HTTP请求
-	req, err := http.NewRequest("POST", c.URL, bytes.NewBuffer(jsonData))
-	if err != nil {
-		return "", fmt.Errorf("failed to create request: %v", err)
-	}
-
-	// 设置请求头
-	req.Header.Set("Authorization", "Bearer "+c.APIKey)
-	req.Header.Set("Content-Type", "application/json")
-	for k, v := range c.Headers {
-		req.Header.Set(k, v)
-	}
-
-	// 发送请求
-	resp, err := c.Client.Do(req)
-	if err != nil {
-		return "", fmt.Errorf("failed to send request: %v", err)
-	}
-	defer resp.Body.Close()
-
-	// 检查响应状态码
-	if resp.StatusCode > HTTP_STATUS_SUCCESS_MAX {
-		body, _ := io.ReadAll(resp.Body)
-		return "", fmt.Errorf("unexpected status code: %d, body: %s", resp.StatusCode, string(body))
-	}
-
-	// 读取响应
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("failed to read response body: %v", err)
-	}
-
-	// 解析响应
-	var chatResp ChatCompletionResponse
-	if err := json.Unmarshal(body, &chatResp); err != nil {
-		return "", fmt.Errorf("failed to unmarshal response: %v", err)
-	}
-
-	if len(chatResp.Choices) == 0 {
-		return "", fmt.Errorf("no response from AI model")
-	}
-
-	return chatResp.Choices[0].Message.Content, nil
-}

alert/pipeline/processor/aisummary/ai_summary_test.go

@@ -1,69 +0,0 @@
-package aisummary
-
-import (
-	"testing"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAISummaryConfig_Process(t *testing.T) {
-	// 创建测试配置
-	config := &AISummaryConfig{
-		HTTPConfig: callback.HTTPConfig{
-			URL:           "https://generativelanguage.googleapis.com/v1beta/openai/chat/completions",
-			Timeout:       30000,
-			SkipSSLVerify: true,
-			Headers: map[string]string{
-				"Content-Type": "application/json",
-			},
-		},
-		ModelName:      "gemini-2.0-flash",
-		APIKey:         "*",
-		PromptTemplate: "告警规则：{{$event.RuleName}}\n严重程度：{{$event.Severity}}",
-		CustomParams: map[string]interface{}{
-			"temperature": 0.7,
-			"max_tokens":  2000,
-			"top_p":       0.9,
-		},
-	}
-
-	// 创建测试事件
-	event := &models.AlertCurEvent{
-		RuleName: "Test Rule",
-		Severity: 1,
-		TagsMap: map[string]string{
-			"host": "test-host",
-		},
-		AnnotationsJSON: map[string]string{
-			"description": "Test alert",
-		},
-	}
-
-	// 测试模板处理
-	eventInfo, err := config.prepareEventInfo(event)
-	assert.NoError(t, err)
-	assert.Contains(t, eventInfo, "Test Rule")
-	assert.Contains(t, eventInfo, "1")
-
-	// 测试配置初始化
-	processor, err := config.Init(config)
-	assert.NoError(t, err)
-	assert.NotNil(t, processor)
-
-	// 测试处理函数
-	result, _, err := processor.Process(&ctx.Context{}, event)
-	assert.NoError(t, err)
-	assert.NotNil(t, result)
-	assert.NotEmpty(t, result.AnnotationsJSON["ai_summary"])
-
-	// 展示处理结果
-	t.Log("\n=== 处理结果 ===")
-	t.Logf("告警规则: %s", result.RuleName)
-	t.Logf("严重程度: %d", result.Severity)
-	t.Logf("标签: %v", result.TagsMap)
-	t.Logf("原始注释: %v", result.AnnotationsJSON["description"])
-	t.Logf("AI总结: %s", result.AnnotationsJSON["ai_summary"])
-}

alert/pipeline/processor/callback/callback.go

@@ -1,103 +0,0 @@
-package callback
-
-import (
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/toolkits/pkg/logger"
-)
-
-type HTTPConfig struct {
-	URL           string            `json:"url"`
-	Method        string            `json:"method,omitempty"`
-	Body          string            `json:"body,omitempty"`
-	Headers       map[string]string `json:"header"`
-	AuthUsername  string            `json:"auth_username"`
-	AuthPassword  string            `json:"auth_password"`
-	Timeout       int               `json:"timeout"` // 单位:ms
-	SkipSSLVerify bool              `json:"skip_ssl_verify"`
-	Proxy         string            `json:"proxy"`
-	Client        *http.Client      `json:"-"`
-}
-
-// RelabelConfig
-type CallbackConfig struct {
-	HTTPConfig
-}
-
-func init() {
-	models.RegisterProcessor("callback", &CallbackConfig{})
-}
-
-func (c *CallbackConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*CallbackConfig](settings)
-	return result, err
-}
-
-func (c *CallbackConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
-	if c.Client == nil {
-		transport := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
-		}
-
-		if c.Proxy != "" {
-			proxyURL, err := url.Parse(c.Proxy)
-			if err != nil {
-				return event, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
-			} else {
-				transport.Proxy = http.ProxyURL(proxyURL)
-			}
-		}
-
-		c.Client = &http.Client{
-			Timeout:   time.Duration(c.Timeout) * time.Millisecond,
-			Transport: transport,
-		}
-	}
-
-	headers := make(map[string]string)
-	headers["Content-Type"] = "application/json"
-	for k, v := range c.Headers {
-		headers[k] = v
-	}
-
-	body, err := json.Marshal(event)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
-	}
-
-	req, err := http.NewRequest("POST", c.URL, strings.NewReader(string(body)))
-	if err != nil {
-		return event, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
-	}
-
-	for k, v := range headers {
-		req.Header.Set(k, v)
-	}
-
-	if c.AuthUsername != "" && c.AuthPassword != "" {
-		req.SetBasicAuth(c.AuthUsername, c.AuthPassword)
-	}
-
-	resp, err := c.Client.Do(req)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
-	}
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to read response body: %v processor: %v", err, c)
-	}
-
-	logger.Debugf("callback processor response body: %s", string(b))
-	return event, "callback success", nil
-}

alert/pipeline/processor/common/common.go

@@ -1,24 +0,0 @@
-package common
-
-import (
-	"encoding/json"
-)
-
-// InitProcessor 是一个通用的初始化处理器的方法
-// 使用泛型简化处理器初始化逻辑
-// T 必须是 models.Processor 接口的实现
-func InitProcessor[T any](settings interface{}) (T, error) {
-	var zero T
-	b, err := json.Marshal(settings)
-	if err != nil {
-		return zero, err
-	}
-
-	var result T
-	err = json.Unmarshal(b, &result)
-	if err != nil {
-		return zero, err
-	}
-
-	return result, nil
-}

alert/pipeline/processor/eventdrop/event_drop.go

@@ -1,60 +0,0 @@
-package eventdrop
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	texttemplate "text/template"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-	"github.com/toolkits/pkg/logger"
-)
-
-type EventDropConfig struct {
-	Content string `json:"content"`
-}
-
-func init() {
-	models.RegisterProcessor("event_drop", &EventDropConfig{})
-}
-
-func (c *EventDropConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*EventDropConfig](settings)
-	return result, err
-}
-
-func (c *EventDropConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
-	// 使用背景是可以根据此处理器，实现对事件进行更加灵活的过滤的逻辑
-	// 在标签过滤和属性过滤都不满足需求时可以使用
-	// 如果模板执行结果为 true，则删除该事件
-
-	var defs = []string{
-		"{{ $event := . }}",
-		"{{ $labels := .TagsMap }}",
-		"{{ $value := .TriggerValue }}",
-	}
-
-	text := strings.Join(append(defs, c.Content), "")
-
-	tpl, err := texttemplate.New("eventdrop").Funcs(tplx.TemplateFuncMap).Parse(text)
-	if err != nil {
-		return event, "", fmt.Errorf("processor failed to parse template: %v processor: %v", err, c)
-	}
-
-	var body bytes.Buffer
-	if err = tpl.Execute(&body, event); err != nil {
-		return event, "", fmt.Errorf("processor failed to execute template: %v processor: %v", err, c)
-	}
-
-	result := strings.TrimSpace(body.String())
-	logger.Infof("processor eventdrop result: %v", result)
-	if result == "true" {
-		logger.Infof("processor eventdrop drop event: %v", event)
-		return event, "drop event success", nil
-	}
-
-	return event, "drop event failed", nil
-}

alert/pipeline/processor/eventupdate/event_update.go

@@ -1,96 +0,0 @@
-package eventupdate
-
-import (
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/toolkits/pkg/logger"
-)
-
-// RelabelConfig
-type EventUpdateConfig struct {
-	callback.HTTPConfig
-}
-
-func init() {
-	models.RegisterProcessor("event_update", &EventUpdateConfig{})
-}
-
-func (c *EventUpdateConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*EventUpdateConfig](settings)
-	return result, err
-}
-
-func (c *EventUpdateConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
-	if c.Client == nil {
-		transport := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
-		}
-
-		if c.Proxy != "" {
-			proxyURL, err := url.Parse(c.Proxy)
-			if err != nil {
-				return event, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
-			} else {
-				transport.Proxy = http.ProxyURL(proxyURL)
-			}
-		}
-
-		c.Client = &http.Client{
-			Timeout:   time.Duration(c.Timeout) * time.Millisecond,
-			Transport: transport,
-		}
-	}
-
-	headers := make(map[string]string)
-	headers["Content-Type"] = "application/json"
-	for k, v := range c.Headers {
-		headers[k] = v
-	}
-
-	body, err := json.Marshal(event)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
-	}
-
-	req, err := http.NewRequest("POST", c.URL, strings.NewReader(string(body)))
-	if err != nil {
-		return event, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
-	}
-
-	for k, v := range headers {
-		req.Header.Set(k, v)
-	}
-
-	if c.AuthUsername != "" && c.AuthPassword != "" {
-		req.SetBasicAuth(c.AuthUsername, c.AuthPassword)
-	}
-
-	resp, err := c.Client.Do(req)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
-	}
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, "", fmt.Errorf("failed to read response body: %v processor: %v", err, c)
-	}
-	logger.Debugf("event update processor response body: %s", string(b))
-
-	err = json.Unmarshal(b, &event)
-	if err != nil {
-		return event, "", fmt.Errorf("failed to unmarshal response body: %v processor: %v", err, c)
-	}
-
-	return event, "", nil
-}

alert/pipeline/processor/relabel/relabel.go

@@ -1,107 +0,0 @@
-package relabel
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pushgw/pconf"
-	"github.com/ccfos/nightingale/v6/pushgw/writer"
-
-	"github.com/prometheus/common/model"
-	"github.com/prometheus/prometheus/prompb"
-)
-
-const (
-	REPLACE_DOT = "___"
-)
-
-// RelabelConfig
-type RelabelConfig struct {
-	SourceLabels  []string `json:"source_labels"`
-	Separator     string   `json:"separator"`
-	Regex         string   `json:"regex"`
-	RegexCompiled *regexp.Regexp
-	If            string `json:"if"`
-	IfRegex       *regexp.Regexp
-	Modulus       uint64 `json:"modulus"`
-	TargetLabel   string `json:"target_label"`
-	Replacement   string `json:"replacement"`
-	Action        string `json:"action"`
-}
-
-func init() {
-	models.RegisterProcessor("relabel", &RelabelConfig{})
-}
-
-func (r *RelabelConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*RelabelConfig](settings)
-	return result, err
-}
-
-func (r *RelabelConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
-	sourceLabels := make([]model.LabelName, len(r.SourceLabels))
-	for i := range r.SourceLabels {
-		sourceLabels[i] = model.LabelName(strings.ReplaceAll(r.SourceLabels[i], ".", REPLACE_DOT))
-	}
-
-	relabelConfigs := []*pconf.RelabelConfig{
-		{
-			SourceLabels:  sourceLabels,
-			Separator:     r.Separator,
-			Regex:         r.Regex,
-			RegexCompiled: r.RegexCompiled,
-			If:            r.If,
-			IfRegex:       r.IfRegex,
-			Modulus:       r.Modulus,
-			TargetLabel:   r.TargetLabel,
-			Replacement:   r.Replacement,
-			Action:        r.Action,
-		},
-	}
-
-	EventRelabel(event, relabelConfigs)
-	return event, "", nil
-}
-
-func EventRelabel(event *models.AlertCurEvent, relabelConfigs []*pconf.RelabelConfig) {
-	labels := make([]prompb.Label, len(event.TagsJSON))
-	event.OriginalTagsJSON = make([]string, len(event.TagsJSON))
-	for i, tag := range event.TagsJSON {
-		label := strings.SplitN(tag, "=", 2)
-		if len(label) != 2 {
-			continue
-		}
-		event.OriginalTagsJSON[i] = tag
-
-		label[0] = strings.ReplaceAll(string(label[0]), ".", REPLACE_DOT)
-		labels[i] = prompb.Label{Name: label[0], Value: label[1]}
-	}
-
-	for i := 0; i < len(relabelConfigs); i++ {
-		if relabelConfigs[i].Replacement == "" {
-			relabelConfigs[i].Replacement = "$1"
-		}
-
-		if relabelConfigs[i].Separator == "" {
-			relabelConfigs[i].Separator = ";"
-		}
-
-		if relabelConfigs[i].Regex == "" {
-			relabelConfigs[i].Regex = "(.*)"
-		}
-	}
-
-	gotLabels := writer.Process(labels, relabelConfigs...)
-	event.TagsJSON = make([]string, len(gotLabels))
-	event.TagsMap = make(map[string]string, len(gotLabels))
-	for i, label := range gotLabels {
-		label.Name = strings.ReplaceAll(string(label.Name), REPLACE_DOT, ".")
-		event.TagsJSON[i] = fmt.Sprintf("%s=%s", label.Name, label.Value)
-		event.TagsMap[label.Name] = label.Value
-	}
-	event.Tags = strings.Join(event.TagsJSON, ",,")
-}

alert/process/process.go

@@ -2,7 +2,6 @@ package process
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"html/template"
 	"sort"
@@ -14,13 +13,14 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/mute"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/relabel"
 	"github.com/ccfos/nightingale/v6/alert/queue"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
+	"github.com/ccfos/nightingale/v6/pushgw/writer"
 
+	"github.com/prometheus/prometheus/prompb"
 	"github.com/robfig/cron/v3"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
@@ -60,9 +60,11 @@ type Processor struct {
 	pendingsUseByRecover *AlertCurEventMap
 	inhibit              bool
 
-	tagsMap   map[string]string
-	tagsArr   []string
-	groupName string
+	tagsMap    map[string]string
+	tagsArr    []string
+	target     string
+	targetNote string
+	groupName  string
 
 	alertRuleCache          *memsto.AlertRuleCacheType
 	TargetCache             *memsto.TargetCacheType
@@ -151,30 +153,19 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	eventsMap := make(map[string][]*models.AlertCurEvent)
 	for _, anomalyPoint := range anomalyPoints {
 		event := p.BuildEvent(anomalyPoint, from, now, ruleHash)
-		event.NotifyRuleIds = cachedRule.NotifyRuleIds
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
-		isMuted, detail, muteId := mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache)
+		isMuted, detail := mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache)
 		if isMuted {
+			p.Stats.CounterMuteTotal.WithLabelValues(event.GroupName).Inc()
 			logger.Debugf("rule_eval:%s event:%v is muted, detail:%s", p.Key(), event, detail)
-			p.Stats.CounterMuteTotal.WithLabelValues(
-				fmt.Sprintf("%v", event.GroupName),
-				fmt.Sprintf("%v", p.rule.Id),
-				fmt.Sprintf("%v", muteId),
-				fmt.Sprintf("%v", p.datasourceId),
-			).Inc()
 			continue
 		}
 
 		if p.EventMuteHook(event) {
+			p.Stats.CounterMuteTotal.WithLabelValues(event.GroupName).Inc()
 			logger.Debugf("rule_eval:%s event:%v is muted by hook", p.Key(), event)
-			p.Stats.CounterMuteTotal.WithLabelValues(
-				fmt.Sprintf("%v", event.GroupName),
-				fmt.Sprintf("%v", p.rule.Id),
-				fmt.Sprintf("%v", 0),
-				fmt.Sprintf("%v", p.datasourceId),
-			).Inc()
 			continue
 		}
 
@@ -193,7 +184,7 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 
 func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, now int64, ruleHash string) *models.AlertCurEvent {
 	p.fillTags(anomalyPoint)
-
+	p.mayHandleIdent()
 	hash := Hash(p.rule.Id, p.datasourceId, anomalyPoint)
 	ds := p.datasourceCache.GetById(p.datasourceId)
 	var dsName string
@@ -213,6 +204,8 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.DatasourceId = p.datasourceId
 	event.Cluster = dsName
 	event.Hash = hash
+	event.TargetIdent = p.target
+	event.TargetNote = p.targetNote
 	event.TriggerValue = anomalyPoint.ReadableValue()
 	event.TriggerValues = anomalyPoint.Values
 	event.TriggerValuesJson = models.EventTriggerValues{ValuesWithUnit: anomalyPoint.ValuesUnit}
@@ -222,6 +215,7 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.Callbacks = p.rule.Callbacks
 	event.CallbacksJSON = p.rule.CallbacksJSON
 	event.Annotations = p.rule.Annotations
+	event.AnnotationsJSON = make(map[string]string)
 	event.RuleConfig = p.rule.RuleConfig
 	event.RuleConfigJson = p.rule.RuleConfigJson
 	event.Severity = anomalyPoint.Severity
@@ -230,18 +224,13 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.RecoverConfig = anomalyPoint.RecoverConfig
 	event.RuleHash = ruleHash
 
-	if anomalyPoint.TriggerType == models.TriggerTypeNodata {
-		event.TriggerValue = "nodata"
-		ruleConfig := models.RuleQuery{}
-		json.Unmarshal([]byte(p.rule.RuleConfig), &ruleConfig)
-		ruleConfig.TriggerType = anomalyPoint.TriggerType
-		b, _ := json.Marshal(ruleConfig)
-		event.RuleConfig = string(b)
-	}
-
-	if err := json.Unmarshal([]byte(p.rule.Annotations), &event.AnnotationsJSON); err != nil {
-		event.AnnotationsJSON = make(map[string]string) // 解析失败时使用空 map
-		logger.Warningf("unmarshal annotations json failed: %v, rule: %d", err, p.rule.Id)
+	if p.target != "" {
+		if pt, exist := p.TargetCache.Get(p.target); exist {
+			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
+			event.Target = pt
+		} else {
+			logger.Infof("Target[ident: %s] doesn't exist in cache.", p.target)
+		}
 	}
 
 	if event.TriggerValues != "" && strings.Count(event.TriggerValues, "$") > 1 {
@@ -257,19 +246,6 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 
 	// 生成事件之后，立马进程 relabel 处理
 	Relabel(p.rule, event)
-
-	// 放到 Relabel(p.rule, event) 下面，为了处理 relabel 之后，标签里才出现 ident 的情况
-	p.mayHandleIdent(event)
-
-	if event.TargetIdent != "" {
-		if pt, exist := p.TargetCache.Get(event.TargetIdent); exist {
-			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
-			event.Target = pt
-		} else {
-			logger.Infof("fill event target error, ident: %s doesn't exist in cache.", event.TargetIdent)
-		}
-	}
-
 	return event
 }
 
@@ -278,15 +254,44 @@ func Relabel(rule *models.AlertRule, event *models.AlertCurEvent) {
 		return
 	}
 
-	// need to keep the original label
-	event.OriginalTags = event.Tags
-	event.OriginalTagsJSON = event.TagsJSON
-
 	if len(rule.EventRelabelConfig) == 0 {
 		return
 	}
 
-	relabel.EventRelabel(event, rule.EventRelabelConfig)
+	// need to keep the original label
+	event.OriginalTags = event.Tags
+	event.OriginalTagsJSON = make([]string, len(event.TagsJSON))
+
+	labels := make([]prompb.Label, len(event.TagsJSON))
+	for i, tag := range event.TagsJSON {
+		label := strings.SplitN(tag, "=", 2)
+		event.OriginalTagsJSON[i] = tag
+		labels[i] = prompb.Label{Name: label[0], Value: label[1]}
+	}
+
+	for i := 0; i < len(rule.EventRelabelConfig); i++ {
+		if rule.EventRelabelConfig[i].Replacement == "" {
+			rule.EventRelabelConfig[i].Replacement = "$1"
+		}
+
+		if rule.EventRelabelConfig[i].Separator == "" {
+			rule.EventRelabelConfig[i].Separator = ";"
+		}
+
+		if rule.EventRelabelConfig[i].Regex == "" {
+			rule.EventRelabelConfig[i].Regex = "(.*)"
+		}
+	}
+
+	// relabel process
+	relabels := writer.Process(labels, rule.EventRelabelConfig...)
+	event.TagsJSON = make([]string, len(relabels))
+	event.TagsMap = make(map[string]string, len(relabels))
+	for i, label := range relabels {
+		event.TagsJSON[i] = fmt.Sprintf("%s=%s", label.Name, label.Value)
+		event.TagsMap[label.Name] = label.Value
+	}
+	event.Tags = strings.Join(event.TagsJSON, ",,")
 }
 
 func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64, inhibit bool) {
@@ -406,8 +411,8 @@ func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value
 
 func (p *Processor) handleEvent(events []*models.AlertCurEvent) {
 	var fireEvents []*models.AlertCurEvent
-	// severity 初始为最低优先级, 一定为遇到比自己优先级高的事件
-	severity := models.SeverityLowest
+	// severity 初始为 4, 一定为遇到比自己优先级高的事件
+	severity := 4
 	for _, event := range events {
 		if event == nil {
 			continue
@@ -533,12 +538,6 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	fireMap := make(map[string]*models.AlertCurEvent)
 	pendingsUseByRecoverMap := make(map[string]*models.AlertCurEvent)
 	for _, event := range curEvents {
-		alertRule := p.alertRuleCache.Get(event.RuleId)
-		if alertRule == nil {
-			continue
-		}
-		event.NotifyRuleIds = alertRule.NotifyRuleIds
-
 		if event.Cate == models.HOST {
 			target, exists := p.TargetCache.Get(event.TargetIdent)
 			if exists && target.EngineName != p.EngineName && !(p.ctx.IsCenter && target.EngineName == "") {
@@ -611,19 +610,19 @@ func (p *Processor) fillTags(anomalyPoint models.AnomalyPoint) {
 	p.tagsArr = labelMapToArr(tagsMap)
 }
 
-func (p *Processor) mayHandleIdent(event *models.AlertCurEvent) {
+func (p *Processor) mayHandleIdent() {
 	// handle ident
-	if ident, has := event.TagsMap["ident"]; has {
+	if ident, has := p.tagsMap["ident"]; has {
 		if target, exists := p.TargetCache.Get(ident); exists {
-			event.TargetIdent = target.Ident
-			event.TargetNote = target.Note
+			p.target = target.Ident
+			p.targetNote = target.Note
 		} else {
-			event.TargetIdent = ident
-			event.TargetNote = ""
+			p.target = ident
+			p.targetNote = ""
 		}
 	} else {
-		event.TargetIdent = ""
-		event.TargetNote = ""
+		p.target = ""
+		p.targetNote = ""
 	}
 }
 

alert/record/prom_rule.go

@@ -39,7 +39,7 @@ func NewRecordRuleContext(rule *models.RecordingRule, datasourceId int64, promCl
 		rule.CronPattern = fmt.Sprintf("@every %ds", rule.PromEvalInterval)
 	}
 
-	rrc.scheduler = cron.New(cron.WithSeconds(), cron.WithChain(cron.SkipIfStillRunning(cron.DefaultLogger)))
+	rrc.scheduler = cron.New(cron.WithSeconds())
 	_, err := rrc.scheduler.AddFunc(rule.CronPattern, func() {
 		rrc.Eval()
 	})
@@ -56,13 +56,12 @@ func (rrc *RecordRuleContext) Key() string {
 }
 
 func (rrc *RecordRuleContext) Hash() string {
-	return str.MD5(fmt.Sprintf("%d_%s_%s_%d_%s_%s",
+	return str.MD5(fmt.Sprintf("%d_%s_%s_%d_%s",
 		rrc.rule.Id,
 		rrc.rule.CronPattern,
 		rrc.rule.PromQl,
 		rrc.datasourceId,
 		rrc.rule.AppendTags,
-		rrc.rule.Name,
 	))
 }
 

alert/router/router_event.go

@@ -40,8 +40,8 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 
 		event.TagsMap[arr[0]] = arr[1]
 	}
-	hit, _ :=  mute.EventMuteStrategy(event, rt.AlertMuteCache)
-	if hit {
+
+	if mute.EventMuteStrategy(event, rt.AlertMuteCache) {
 		logger.Infof("event_muted: rule_id=%d %s", event.RuleId, event.Hash)
 		ginx.NewRender(c).Message(nil)
 		return

alert/sender/callback.go

@@ -135,14 +135,14 @@ func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
 func doSendAndRecord(ctx *ctx.Context, url, token string, body interface{}, channel string,
 	stats *astats.Stats, events []*models.AlertCurEvent) {
 	res, err := doSend(url, body, channel, stats)
-	NotifyRecord(ctx, events, 0, channel, token, res, err)
+	NotifyRecord(ctx, events, channel, token, res, err)
 }
 
-func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, notifyRuleID int64, channel, target, res string, err error) {
+func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, channel, target, res string, err error) {
 	// 一个通知可能对应多个 event，都需要记录
 	notis := make([]*models.NotificaitonRecord, 0, len(evts))
 	for _, evt := range evts {
-		noti := models.NewNotificationRecord(evt, notifyRuleID, channel, target)
+		noti := models.NewNotificationRecord(evt, channel, target)
 		if err != nil {
 			noti.SetStatus(models.NotiStatusFailure)
 			noti.SetDetails(err.Error())
@@ -153,14 +153,16 @@ func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, notifyRuleID i
 	}
 
 	if !ctx.IsCenter {
-		err := poster.PostByUrls(ctx, "/v1/n9e/notify-record", notis)
+		_, err := poster.PostByUrlsWithResp[[]int64](ctx, "/v1/n9e/notify-record", notis)
 		if err != nil {
 			logger.Errorf("add notis:%v failed, err: %v", notis, err)
 		}
 		return
 	}
 
-	PushNotifyRecords(notis)
+	if err := models.DB(ctx).CreateInBatches(notis, 100).Error; err != nil {
+		logger.Errorf("add notis:%v failed, err: %v", notis, err)
+	}
 }
 
 func doSend(url string, body interface{}, channel string, stats *astats.Stats) (string, error) {

alert/sender/email.go

@@ -205,7 +205,7 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 				if err == nil {
 					msg = "ok"
 				}
-				NotifyRecord(ctx, m.events, 0, models.Email, to, msg, err)
+				NotifyRecord(ctx, m.events, models.Email, to, msg, err)
 			}
 
 			size++

alert/sender/ibex.go

@@ -30,14 +30,12 @@ type IbexCallBacker struct {
 
 func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
 	if len(ctx.CallBackURL) == 0 || len(ctx.Events) == 0 {
-		logger.Warningf("event_callback_ibex: url or events is empty, url: %s, events: %+v", ctx.CallBackURL, ctx.Events)
 		return
 	}
 
 	event := ctx.Events[0]
 
 	if event.IsRecovered {
-		logger.Infof("event_callback_ibex: event is recovered, event: %+v", event)
 		return
 	}
 
@@ -45,9 +43,8 @@ func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
 }
 
 func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent) {
-	logger.Infof("event_callback_ibex: url: %s, event: %+v", url, event)
 	if imodels.DB() == nil && ctx.IsCenter {
-		logger.Warningf("event_callback_ibex: db is nil, event: %+v", event)
+		logger.Warning("event_callback_ibex: db is nil")
 		return
 	}
 
@@ -66,23 +63,17 @@ func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.
 
 	id, err := strconv.ParseInt(idstr, 10, 64)
 	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to parse url: %s event: %+v", url, event)
+		logger.Errorf("event_callback_ibex: failed to parse url: %s", url)
 		return
 	}
 
 	if host == "" {
 		// 用户在callback url中没有传入host，就从event中解析
 		host = event.TargetIdent
-
-		if host == "" {
-			if ident, has := event.TagsMap["ident"]; has {
-				host = ident
-			}
-		}
 	}
 
 	if host == "" {
-		logger.Errorf("event_callback_ibex: failed to get host, id: %d, event: %+v", id, event)
+		logger.Error("event_callback_ibex: failed to get host")
 		return
 	}
 
@@ -92,23 +83,21 @@ func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.
 func CallIbex(ctx *ctx.Context, id int64, host string,
 	taskTplCache *memsto.TaskTplCache, targetCache *memsto.TargetCacheType,
 	userCache *memsto.UserCacheType, event *models.AlertCurEvent) {
-	logger.Infof("event_callback_ibex: id: %d, host: %s, event: %+v", id, host, event)
-
 	tpl := taskTplCache.Get(id)
 	if tpl == nil {
-		logger.Errorf("event_callback_ibex: no such tpl(%d), event: %+v", id, event)
+		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
 		return
 	}
 	// check perm
 	// tpl.GroupId - host - account 三元组校验权限
 	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
 	if err != nil {
-		logger.Errorf("event_callback_ibex: check perm fail: %v, event: %+v", err, event)
+		logger.Errorf("event_callback_ibex: check perm fail: %v", err)
 		return
 	}
 
 	if !can {
-		logger.Errorf("event_callback_ibex: user(%s) no permission, event: %+v", tpl.UpdateBy, event)
+		logger.Errorf("event_callback_ibex: user(%s) no permission", tpl.UpdateBy)
 		return
 	}
 
@@ -133,7 +122,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 
 	tags, err := json.Marshal(tagsMap)
 	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v, event: %+v", tagsMap, event)
+		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v", tagsMap)
 		return
 	}
 
@@ -156,7 +145,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 
 	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
 	if err != nil {
-		logger.Errorf("event_callback_ibex: call ibex fail: %v, event: %+v", err, event)
+		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
 		return
 	}
 
@@ -178,7 +167,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 	}
 
 	if err = record.Add(ctx); err != nil {
-		logger.Errorf("event_callback_ibex: persist task_record fail: %v, event: %+v", err, event)
+		logger.Errorf("event_callback_ibex: persist task_record fail: %v", err)
 	}
 }
 
@@ -198,7 +187,7 @@ func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *m
 
 func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
 	if storage.Cache == nil {
-		logger.Warningf("event_callback_ibex: redis cache is nil, task: %+v", f)
+		logger.Warning("event_callback_ibex: redis cache is nil")
 		return 0, fmt.Errorf("redis cache is nil")
 	}
 

alert/sender/mm.go

@@ -74,7 +74,7 @@ func SendMM(ctx *ctx.Context, message MatterMostMessage, events []*models.AlertC
 		u, err := url.Parse(message.Tokens[i])
 		if err != nil {
 			logger.Errorf("mm_sender: failed to parse error=%v", err)
-			NotifyRecord(ctx, events, 0, channel, message.Tokens[i], "", err)
+			NotifyRecord(ctx, events, channel, message.Tokens[i], "", err)
 			continue
 		}
 

alert/sender/notify_record_queue.go

@@ -1,75 +0,0 @@
-package sender
-
-import (
-	"errors"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/toolkits/pkg/container/list"
-	"github.com/toolkits/pkg/logger"
-)
-
-// 通知记录队列，最大长度 1000000
-var NotifyRecordQueue = list.NewSafeListLimited(1000000)
-
-// 每秒上报通知记录队列大小
-func ReportNotifyRecordQueueSize(stats *astats.Stats) {
-	for {
-		time.Sleep(time.Second)
-		stats.GaugeNotifyRecordQueueSize.Set(float64(NotifyRecordQueue.Len()))
-	}
-}
-
-// 推送通知记录到队列
-// 若队列满 则返回 error
-func PushNotifyRecords(records []*models.NotificaitonRecord) error {
-	for _, record := range records {
-		if ok := NotifyRecordQueue.PushFront(record); !ok {
-			logger.Warningf("notify record queue is full, record: %+v", record)
-			return errors.New("notify record queue is full")
-		}
-	}
-
-	return nil
-}
-
-type NotifyRecordConsumer struct {
-	ctx *ctx.Context
-}
-
-func NewNotifyRecordConsumer(ctx *ctx.Context) *NotifyRecordConsumer {
-	return &NotifyRecordConsumer{
-		ctx: ctx,
-	}
-}
-
-// 消费通知记录队列 每 100ms 检测一次队列是否为空
-func (c *NotifyRecordConsumer) LoopConsume() {
-	duration := time.Duration(100) * time.Millisecond
-	for {
-		// 无论队列是否为空 都需要等待
-		time.Sleep(duration)
-
-		inotis := NotifyRecordQueue.PopBackBy(100)
-
-		if len(inotis) == 0 {
-			continue
-		}
-
-		// 类型转换，不然 CreateInBatches 会报错
-		notis := make([]*models.NotificaitonRecord, 0, len(inotis))
-		for _, inoti := range inotis {
-			notis = append(notis, inoti.(*models.NotificaitonRecord))
-		}
-
-		c.consume(notis)
-	}
-}
-
-func (c *NotifyRecordConsumer) consume(notis []*models.NotificaitonRecord) {
-	if err := models.DB(c.ctx).CreateInBatches(notis, 100).Error; err != nil {
-		logger.Errorf("add notis:%v failed, err: %v", notis, err)
-	}
-}

alert/sender/plugin.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"time"
-	"unicode/utf8"
 
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
@@ -86,25 +85,7 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	}
 
 	err, isTimeout := sys.WrapTimeout(cmd, time.Duration(config.Timeout)*time.Second)
-
-	res := buf.String()
-
-	// 截断超出长度的输出
-	if len(res) > 512 {
-		// 确保在有效的UTF-8字符边界处截断
-		validLen := 0
-		for i := 0; i < 512 && i < len(res); {
-			_, size := utf8.DecodeRuneInString(res[i:])
-			if i+size > 512 {
-				break
-			}
-			i += size
-			validLen = i
-		}
-		res = res[:validLen] + "..."
-	}
-
-	NotifyRecord(ctx, []*models.AlertCurEvent{event}, 0, channel, cmd.String(), res, buildErr(err, isTimeout))
+	NotifyRecord(ctx, []*models.AlertCurEvent{event}, channel, cmd.String(), "", buildErr(err, isTimeout))
 
 	if isTimeout {
 		if err == nil {
@@ -119,12 +100,12 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	}
 
 	if err != nil {
-		logger.Errorf("event_script_notify_fail: exec script %s occur error: %v, output: %s", fpath, err, res)
+		logger.Errorf("event_script_notify_fail: exec script %s occur error: %v, output: %s", fpath, err, buf.String())
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
 		return
 	}
 
-	logger.Infof("event_script_notify_ok: exec %s output: %s", fpath, res)
+	logger.Infof("event_script_notify_ok: exec %s output: %s", fpath, buf.String())
 }
 
 func buildErr(err error, isTimeout bool) error {

alert/sender/telegram.go

@@ -72,7 +72,7 @@ func SendTelegram(ctx *ctx.Context, message TelegramMessage, events []*models.Al
 	for i := 0; i < len(message.Tokens); i++ {
 		if !strings.Contains(message.Tokens[i], "/") && !strings.HasPrefix(message.Tokens[i], "https://") {
 			logger.Errorf("telegram_sender: result=fail invalid token=%s", message.Tokens[i])
-			NotifyRecord(ctx, events, 0, channel, message.Tokens[i], "", errors.New("invalid token"))
+			NotifyRecord(ctx, events, channel, message.Tokens[i], "", errors.New("invalid token"))
 			continue
 		}
 		var url string

alert/sender/webhook.go

@@ -100,7 +100,7 @@ func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, e
 		retryCount := 0
 		for retryCount < 3 {
 			needRetry, res, err := sendWebhook(conf, event, stats)
-			NotifyRecord(ctx, []*models.AlertCurEvent{event}, 0, "webhook", conf.Url, res, err)
+			NotifyRecord(ctx, []*models.AlertCurEvent{event}, "webhook", conf.Url, res, err)
 			if !needRetry {
 				break
 			}
@@ -170,7 +170,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 			retryCount := 0
 			for retryCount < webhook.RetryCount {
 				needRetry, res, err := sendWebhook(webhook, events, stats)
-				go NotifyRecord(ctx, events, 0, "webhook", webhook.Url, res, err)
+				go NotifyRecord(ctx, events, "webhook", webhook.Url, res, err)
 				if !needRetry {
 					break
 				}

center/cconf/ops.go

@@ -15,25 +15,9 @@ type Operation struct {
 }
 
 type Ops struct {
-	Name  string     `yaml:"name" json:"name"`
-	Cname string     `yaml:"cname" json:"cname"`
-	Ops   []SingleOp `yaml:"ops" json:"ops"`
-}
-
-// SingleOp Name 为 op 名称；Cname 为展示名称，默认英文
-type SingleOp struct {
-	Name  string `yaml:"name" json:"name"`
-	Cname string `yaml:"cname" json:"cname"`
-}
-
-func TransformNames(name []string, nameToName map[string]string) []string {
-	var ret []string
-	for _, n := range name {
-		if v, has := nameToName[n]; has {
-			ret = append(ret, v)
-		}
-	}
-	return ret
+	Name  string   `yaml:"name" json:"name"`
+	Cname string   `yaml:"cname" json:"cname"`
+	Ops   []string `yaml:"ops" json:"ops"`
 }
 
 func LoadOpsYaml(configDir string, opsYamlFile string) error {
@@ -55,8 +39,8 @@ func LoadOpsYaml(configDir string, opsYamlFile string) error {
 	return file.ReadYaml(fp, &Operations)
 }
 
-func GetAllOps(ops []Ops) []SingleOp {
-	var ret []SingleOp
+func GetAllOps(ops []Ops) []string {
+	var ret []string
 	for _, op := range ops {
 		ret = append(ret, op.Ops...)
 	}
@@ -64,7 +48,7 @@ func GetAllOps(ops []Ops) []SingleOp {
 }
 
 func MergeOperationConf() error {
-	var opsBuiltIn Operation
+	opsBuiltIn := Operation{}
 	err := yaml.Unmarshal([]byte(builtInOps), &opsBuiltIn)
 	if err != nil {
 		return fmt.Errorf("cannot parse builtInOps: %s", err.Error())
@@ -85,221 +69,138 @@ func MergeOperationConf() error {
 const (
 	builtInOps = `
 ops:
-- name: Infrastructure
-  cname: Infrastructure
+- name: dashboards
+  cname: 仪表盘
   ops:
-    - name: /targets
-      cname: Host - View
-    - name: /targets/put
-      cname: Host - Modify
-    - name: /targets/del
-      cname: Host - Delete
-    - name: /targets/bind
-      cname: Host - Bind Uncategorized
+    - "/dashboards"
+    - "/dashboards/add"
+    - "/dashboards/put"
+    - "/dashboards/del"
+    - "/embedded-dashboards/put"
+    - "/embedded-dashboards"
+    - "/public-dashboards"
 
-- name: Explorer
-  cname: Explorer
+- name: alert
+  cname: 告警规则
   ops:
-    - name: /metric/explorer
-      cname: Metrics Explorer
-    - name: /object/explorer
-      cname: Quick View
-    - name: /metrics-built-in
-      cname: Built-in Metric - View
-    - name: /builtin-metrics/add
-      cname: Built-in Metric - Add
-    - name: /builtin-metrics/put
-      cname: Built-in Metric - Modify
-    - name: /builtin-metrics/del
-      cname: Built-in Metric - Delete
-    - name: /recording-rules
-      cname: Recording Rule - View
-    - name: /recording-rules/add
-      cname: Recording Rule - Add
-    - name: /recording-rules/put
-      cname: Recording Rule - Modify
-    - name: /recording-rules/del
-      cname: Recording Rule - Delete
-    - name: /log/explorer
-      cname: Logs Explorer
-    - name: /log/index-patterns # 前端有个管理索引模式的页面，所以需要一个权限点来控制，后面应该改成侧拉板
-      cname: Index Pattern - View
-    - name: /log/index-patterns/add
-      cname: Index Pattern - Add
-    - name: /log/index-patterns/put
-      cname: Index Pattern - Modify
-    - name: /log/index-patterns/del
-      cname: Index Pattern - Delete
-    - name: /dashboards
-      cname: Dashboard - View
-    - name: /dashboards/add
-      cname: Dashboard - Add
-    - name: /dashboards/put
-      cname: Dashboard - Modify
-    - name: /dashboards/del
-      cname: Dashboard - Delete
-    - name: /public-dashboards
-      cname: Dashboard - View Public
+    - "/alert-rules"
+    - "/alert-rules/add"
+    - "/alert-rules/put"
+    - "/alert-rules/del"
 
-- name: alerting
-  cname: Alerting
+- name: alert-mutes
+  cname: 告警静默管理
   ops:
-    - name: /alert-rules
-      cname: Alerting Rule - View
-    - name: /alert-rules/add
-      cname: Alerting Rule - Add
-    - name: /alert-rules/put
-      cname: Alerting Rule - Modify
-    - name: /alert-rules/del
-      cname: Alerting Rule - Delete
-    - name: /alert-mutes
-      cname: Mutting Rule - View
-    - name: /alert-mutes/add
-      cname: Mutting Rule - Add
-    - name: /alert-mutes/put
-      cname: Mutting Rule - Modify
-    - name: /alert-mutes/del
-      cname: Mutting Rule - Delete
-    - name: /alert-subscribes
-      cname: Subscribing Rule - View
-    - name: /alert-subscribes/add
-      cname: Subscribing Rule - Add
-    - name: /alert-subscribes/put
-      cname: Subscribing Rule - Modify
-    - name: /alert-subscribes/del
-      cname: Subscribing Rule - Delete
-    - name: /job-tpls
-      cname: Self-healing-Script - View
-    - name: /job-tpls/add
-      cname: Self-healing-Script - Add
-    - name: /job-tpls/put
-      cname: Self-healing-Script - Modify
-    - name: /job-tpls/del
-      cname: Self-healing-Script - Delete
-    - name: /job-tasks
-      cname: Self-healing-Job - View
-    - name: /job-tasks/add
-      cname: Self-healing-Job - Add
-    - name: /job-tasks/put
-      cname: Self-healing-Job - Modify
-    - name: /alert-cur-events
-      cname: Active Event - View
-    - name: /alert-cur-events/del
-      cname: Active Event - Delete
-    - name: /alert-his-events
-      cname: Historical Event - View
-
-- name: Notification
-  cname: Notification
+    - "/alert-mutes"
+    - "/alert-mutes/add"
+    - "/alert-mutes/put"
+    - "/alert-mutes/del"
+  
+- name: alert-subscribes
+  cname: 告警订阅管理
   ops:
-    - name: /notification-rules
-      cname: Notification Rule - View
-    - name: /notification-rules/add
-      cname: Notification Rule - Add
-    - name: /notification-rules/put
-      cname: Notification Rule - Modify
-    - name: /notification-rules/del
-      cname: Notification Rule - Delete
-    - name: /notification-channels
-      cname: Media Type - View
-    - name: /notification-channels/add
-      cname: Media Type - Add
-    - name: /notification-channels/put
-      cname: Media Type - Modify
-    - name: /notification-channels/del
-      cname: Media Type - Delete
-    - name: /notification-templates
-      cname: Message Template - View
-    - name: /notification-templates/add
-      cname: Message Template - Add
-    - name: /notification-templates/put
-      cname: Message Template - Modify
-    - name: /notification-templates/del
-      cname: Message Template - Delete
-    - name: /event-pipelines
-      cname: Event Pipeline - View
-    - name: /event-pipelines/add
-      cname: Event Pipeline - Add
-    - name: /event-pipelines/put
-      cname: Event Pipeline - Modify
-    - name: /event-pipelines/del
-      cname: Event Pipeline - Delete
-    - name: /help/notification-settings # 用于控制老版本的通知设置菜单是否展示
-      cname: Notification Settings - View
-    - name: /help/notification-tpls # 用于控制老版本的通知模板菜单是否展示
-      cname: Notification Templates - View
+    - "/alert-subscribes"
+    - "/alert-subscribes/add"
+    - "/alert-subscribes/put"
+    - "/alert-subscribes/del"
 
-- name: Integrations
-  cname: Integrations
+- name: alert-events  
+  cname: 告警事件管理
   ops:
-    - name: /datasources # 用于控制能否看到数据源列表页面的菜单。只有 Admin 才能修改、删除数据源
-      cname: Data Source - View
-    - name: /components
-      cname: Component - View
-    - name: /components/add
-      cname: Component - Add
-    - name: /components/put
-      cname: Component - Modify
-    - name: /components/del
-      cname: Component - Delete
-    - name: /embedded-products
-      cname: Embedded Product - View
-    - name: /embedded-product/add
-      cname: Embedded Product - Add
-    - name: /embedded-product/put
-      cname: Embedded Product - Modify
-    - name: /embedded-product/delete
-      cname: Embedded Product - Delete
+    - "/alert-cur-events"
+    - "/alert-cur-events/del"
+    - "/alert-his-events" 
 
-- name: Organization
-  cname: Organization
+- name: recording-rules
+  cname: 记录规则管理
   ops:
-    - name: /users
-      cname: User - View
-    - name: /users/add
-      cname: User - Add
-    - name: /users/put
-      cname: User - Modify
-    - name: /users/del
-      cname: User - Delete
-    - name: /user-groups
-      cname: Team - View
-    - name: /user-groups/add
-      cname: Team - Add
-    - name: /user-groups/put
-      cname: Team - Modify
-    - name: /user-groups/del
-      cname: Team - Delete
-    - name: /busi-groups
-      cname: Business Group - View
-    - name: /busi-groups/add
-      cname: Business Group - Add
-    - name: /busi-groups/put
-      cname: Business Group - Modify
-    - name: /busi-groups/del
-      cname: Business Group - Delete
-    - name: /roles
-      cname: Role - View
-    - name: /roles/add
-      cname: Role - Add
-    - name: /roles/put
-      cname: Role - Modify
-    - name: /roles/del
-      cname: Role - Delete
+    - "/recording-rules"
+    - "/recording-rules/add"
+    - "/recording-rules/put"
+    - "/recording-rules/del"
 
-- name: System Settings
-  cname: System Settings
+- name: metric
+  cname: 时序指标
   ops:
-    - name: /system/site-settings # 仅用于控制能否展示菜单，只有 Admin 才能修改、删除
-      cname: View Site Settings
-    - name: /system/variable-settings
-      cname: View Variable Settings
-    - name: /system/sso-settings
-      cname: View SSO Settings
-    - name: /system/alerting-engines
-      cname: View Alerting Engines
-    - name: /system/version
-      cname: View Product Version
+  - "/metric/explorer"
+  - "/object/explorer"
 
+- name: log
+  cname: 日志分析
+  ops:
+  - "/log/explorer"
+  - "/log/index-patterns"
+
+- name: targets
+  cname: 基础设施
+  ops:
+    - "/targets"
+    - "/targets/add"
+    - "/targets/put"
+    - "/targets/del"
+    - "/targets/bind"
+
+- name: job
+  cname: 任务管理
+  ops:
+    - "/job-tpls"
+    - "/job-tpls/add"
+    - "/job-tpls/put"
+    - "/job-tpls/del"
+    - "/job-tasks"
+    - "/job-tasks/add"
+    - "/job-tasks/put"
+    - "/ibex-settings"
+
+- name: user
+  cname: 用户管理
+  ops:
+  - "/users"
+  - "/user-groups"
+  - "/user-groups/add"
+  - "/user-groups/put"
+  - "/user-groups/del"
+
+- name: permissions
+  cname: 权限管理
+  ops:
+  - "/permissions"
+
+- name: busi-groups
+  cname: 业务分组管理
+  ops:
+  - "/busi-groups"
+  - "/busi-groups/add"
+  - "/busi-groups/put"
+  - "/busi-groups/del"
+
+- name: builtin-metrics
+  cname: 指标视图
+  ops:
+    - "/metrics-built-in"
+    - "/builtin-metrics/add"
+    - "/builtin-metrics/put"
+    - "/builtin-metrics/del"
+
+- name: built-in-components
+  cname: 模版中心
+  ops:
+    - "/built-in-components"
+    - "/built-in-components/add"
+    - "/built-in-components/put"
+    - "/built-in-components/del"
+
+- name: system
+  cname: 系统信息
+  ops:
+  - "/help/variable-configs"
+  - "/help/version"
+  - "/help/servers"
+  - "/help/source"
+  - "/help/sso"
+  - "/help/notification-tpls"
+  - "/help/notification-settings"
+  - "/help/migrate"
+  - "/site-settings"
 `
 )

center/cconf/plugin.go

@@ -25,22 +25,4 @@ var Plugins = []Plugin{
 		Type:     "tdengine",
 		TypeName: "TDengine",
 	},
-	{
-		Id:       5,
-		Category: "logging",
-		Type:     "ck",
-		TypeName: "ClickHouse",
-	},
-	{
-		Id:       6,
-		Category: "timeseries",
-		Type:     "mysql",
-		TypeName: "MySQL",
-	},
-	{
-		Id:       7,
-		Category: "timeseries",
-		Type:     "pgsql",
-		TypeName: "PostgreSQL",
-	},
 }

center/center.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ccfos/nightingale/v6/dscache"
-
 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
@@ -13,6 +11,7 @@ import (
 	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/center/cconf/rsa"
+	"github.com/ccfos/nightingale/v6/center/cstats"
 	"github.com/ccfos/nightingale/v6/center/integration"
 	"github.com/ccfos/nightingale/v6/center/metas"
 	centerrt "github.com/ccfos/nightingale/v6/center/router"
@@ -28,13 +27,14 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
 	"github.com/ccfos/nightingale/v6/pkg/i18nx"
 	"github.com/ccfos/nightingale/v6/pkg/logx"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
 	"github.com/ccfos/nightingale/v6/pkg/version"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	pushgwrt "github.com/ccfos/nightingale/v6/pushgw/router"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
+	"github.com/ccfos/nightingale/v6/tdengine"
+
 	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )
 
@@ -59,6 +59,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	}
 
 	i18nx.Init(configDir)
+	cstats.Init()
 	flashduty.Init(config.Center.FlashDuty)
 
 	db, err := storage.New(config.DB)
@@ -84,18 +85,11 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	}
 
 	metas := metas.New(redis)
-	idents := idents.New(ctx, redis, config.Pushgw)
+	idents := idents.New(ctx, redis)
 
 	syncStats := memsto.NewSyncStats()
 	alertStats := astats.NewSyncStats()
 
-	if config.Center.MigrateBusiGroupLabel || models.CanMigrateBg(ctx) {
-		models.MigrateBg(ctx, config.Pushgw.BusiGroupLabelKey)
-	}
-	if models.CanMigrateEP(ctx) {
-		models.MigrateEP(ctx)
-	}
-
 	configCache := memsto.NewConfigCache(ctx, syncStats, config.HTTP.RSA.RSAPrivateKey, config.HTTP.RSA.RSAPassWord)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
@@ -107,21 +101,16 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	taskTplCache := memsto.NewTaskTplCache(ctx)
 	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
-	notifyRuleCache := memsto.NewNotifyRuleCache(ctx, syncStats)
-	notifyChannelCache := memsto.NewNotifyChannelCache(ctx, syncStats)
-	messageTemplateCache := memsto.NewMessageTemplateCache(ctx, syncStats)
-	userTokenCache := memsto.NewUserTokenCache(ctx, syncStats)
 
 	sso := sso.Init(config.Center, ctx, configCache)
 	promClients := prom.NewPromClient(ctx)
 
 	dispatch.InitRegisterQueryFunc(promClients)
 
-	externalProcessors := process.NewExternalProcessors()
+	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 
-	macros.RegisterMacro(macros.MacroInVain)
-	dscache.Init(ctx, false)
-	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)
+	externalProcessors := process.NewExternalProcessors()
+	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
 
 	writers := writer.NewWriters(config.Pushgw)
 
@@ -131,10 +120,16 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
 	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, config.Ibex,
-		cconf.Operations, dsCache, notifyConfigCache, promClients,
-		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache, userTokenCache)
+		cconf.Operations, dsCache, notifyConfigCache, promClients, tdengineClients,
+		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
 
+	go func() {
+		if config.Center.MigrateBusiGroupLabel || models.CanMigrateBg(ctx) {
+			models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
+		}
+	}()
+
 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
 
 	centerRouter.Config(r)

center/cstats/stats.go

@@ -6,49 +6,40 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	namespace = "n9e"
-	subsystem = "center"
-)
+const Service = "n9e-center"
 
 var (
-	uptime = prometheus.NewCounter(
+	labels = []string{"service", "code", "path", "method"}
+
+	uptime = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "uptime",
-			Help:      "HTTP service uptime.",
-		},
+			Name: "uptime",
+			Help: "HTTP service uptime.",
+		}, []string{"service"},
+	)
+
+	RequestCounter = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Name: "http_request_count_total",
+			Help: "Total number of HTTP requests made.",
+		}, labels,
 	)
 
 	RequestDuration = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Buckets:   prometheus.DefBuckets,
-			Name:      "http_request_duration_seconds",
-			Help:      "HTTP request latencies in seconds.",
-		}, []string{"code", "path", "method"},
-	)
-
-	RedisOperationLatency = prometheus.NewHistogramVec(
-		prometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: subsystem,
-			Name:      "redis_operation_latency_seconds",
-			Help:      "Histogram of latencies for Redis operations",
-			Buckets:   []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5},
-		},
-		[]string{"operation", "status"},
+			Buckets: []float64{.01, .1, 1, 10},
+			Name:    "http_request_duration_seconds",
+			Help:    "HTTP request latencies in seconds.",
+		}, labels,
 	)
 )
 
-func init() {
+func Init() {
 	// Register the summary and the histogram with Prometheus's default registry.
 	prometheus.MustRegister(
 		uptime,
+		RequestCounter,
 		RequestDuration,
-		RedisOperationLatency,
 	)
 
 	go recordUptime()
@@ -57,6 +48,6 @@ func init() {
 // recordUptime increases service uptime per second.
 func recordUptime() {
 	for range time.Tick(time.Second) {
-		uptime.Inc()
+		uptime.WithLabelValues(Service).Inc()
 	}
 }

center/integration/init.go

@@ -22,14 +22,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 		return
 	}
 
-	if res, err := models.ConfigsSelectByCkey(ctx, "disable_integration_init"); err != nil {
-		logger.Error("fail to get value 'disable_integration_init' from configs", err)
-		return
-	} else if len(res) != 0 {
-		logger.Info("disable_integration_init is set, skip integration init")
-		return
-	}
-
 	fp := builtinIntegrationsDir
 	if fp == "" {
 		fp = path.Join(runner.Cwd, "integrations")

center/metas/metas.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ccfos/nightingale/v6/center/cstats"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/storage"
 
@@ -116,23 +115,15 @@ func (s *Set) updateTargets(m map[string]models.HostMeta) error {
 		}
 		newMap[models.WrapIdent(ident)] = meta
 	}
-
-	start := time.Now()
 	err := storage.MSet(context.Background(), s.redis, newMap)
 	if err != nil {
-		cstats.RedisOperationLatency.WithLabelValues("mset_target_meta", "fail").Observe(time.Since(start).Seconds())
 		return err
-	} else {
-		cstats.RedisOperationLatency.WithLabelValues("mset_target_meta", "success").Observe(time.Since(start).Seconds())
 	}
 
 	if len(extendMap) > 0 {
 		err = storage.MSet(context.Background(), s.redis, extendMap)
 		if err != nil {
-			cstats.RedisOperationLatency.WithLabelValues("mset_target_extend", "fail").Observe(time.Since(start).Seconds())
 			return err
-		} else {
-			cstats.RedisOperationLatency.WithLabelValues("mset_target_extend", "success").Observe(time.Since(start).Seconds())
 		}
 	}
 

center/router/router.go

@@ -24,7 +24,7 @@ import (
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	"github.com/ccfos/nightingale/v6/storage"
-	"gorm.io/gorm"
+	"github.com/ccfos/nightingale/v6/tdengine"
 
 	"github.com/gin-gonic/gin"
 	"github.com/rakyll/statik/fs"
@@ -42,6 +42,7 @@ type Router struct {
 	DatasourceCache   *memsto.DatasourceCacheType
 	NotifyConfigCache *memsto.NotifyConfigCacheType
 	PromClients       *prom.PromClientMap
+	TdendgineClients  *tdengine.TdengineClientMap
 	Redis             storage.Redis
 	MetaSet           *metas.Set
 	IdentSet          *idents.Set
@@ -49,43 +50,43 @@ type Router struct {
 	Sso               *sso.SsoClient
 	UserCache         *memsto.UserCacheType
 	UserGroupCache    *memsto.UserGroupCacheType
-	UserTokenCache    *memsto.UserTokenCacheType
 	Ctx               *ctx.Context
-
-	HeartbeatHook       HeartbeatHookFunc
-	TargetDeleteHook    models.TargetDeleteHookFunc
-	AlertRuleModifyHook AlertRuleModifyHookFunc
+	HeartbeatHook     HeartbeatHookFunc
+	TargetDeleteHook  models.TargetDeleteHookFunc
 }
 
 func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex conf.Ibex,
 	operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType,
-	pc *prom.PromClientMap, redis storage.Redis,
+	pc *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, redis storage.Redis,
 	sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set,
-	tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType, utc *memsto.UserTokenCacheType) *Router {
+	tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType) *Router {
 	return &Router{
-		HTTP:                httpConfig,
-		Center:              center,
-		Alert:               alert,
-		Ibex:                ibex,
-		Operations:          operations,
-		DatasourceCache:     ds,
-		NotifyConfigCache:   ncc,
-		PromClients:         pc,
-		Redis:               redis,
-		MetaSet:             metaSet,
-		IdentSet:            idents,
-		TargetCache:         tc,
-		Sso:                 sso,
-		UserCache:           uc,
-		UserGroupCache:      ugc,
-		UserTokenCache:      utc,
-		Ctx:                 ctx,
-		HeartbeatHook:       func(ident string) map[string]interface{} { return nil },
-		TargetDeleteHook:    func(tx *gorm.DB, idents []string) error { return nil },
-		AlertRuleModifyHook: func(ar *models.AlertRule) {},
+		HTTP:              httpConfig,
+		Center:            center,
+		Alert:             alert,
+		Ibex:              ibex,
+		Operations:        operations,
+		DatasourceCache:   ds,
+		NotifyConfigCache: ncc,
+		PromClients:       pc,
+		TdendgineClients:  tdendgineClients,
+		Redis:             redis,
+		MetaSet:           metaSet,
+		IdentSet:          idents,
+		TargetCache:       tc,
+		Sso:               sso,
+		UserCache:         uc,
+		UserGroupCache:    ugc,
+		Ctx:               ctx,
+		HeartbeatHook:     func(ident string) map[string]interface{} { return nil },
+		TargetDeleteHook:  emptyDeleteHook,
 	}
 }
 
+func emptyDeleteHook(ctx *ctx.Context, idents []string) error {
+	return nil
+}
+
 func stat() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		start := time.Now()
@@ -93,9 +94,10 @@ func stat() gin.HandlerFunc {
 
 		code := fmt.Sprintf("%d", c.Writer.Status())
 		method := c.Request.Method
-		labels := []string{code, c.FullPath(), method}
+		labels := []string{cstats.Service, code, c.FullPath(), method}
 
-		cstats.RequestDuration.WithLabelValues(labels...).Observe(time.Since(start).Seconds())
+		cstats.RequestCounter.WithLabelValues(labels...).Inc()
+		cstats.RequestDuration.WithLabelValues(labels...).Observe(float64(time.Since(start).Seconds()))
 	}
 }
 
@@ -185,24 +187,12 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/datasource/query", rt.datasourceQuery)
 
 			pages.POST("/ds-query", rt.QueryData)
-			pages.POST("/logs-query", rt.QueryLogV2)
+			pages.POST("/logs-query", rt.QueryLog)
 
 			pages.POST("/tdengine-databases", rt.tdengineDatabases)
 			pages.POST("/tdengine-tables", rt.tdengineTables)
 			pages.POST("/tdengine-columns", rt.tdengineColumns)
 
-			pages.POST("/log-query-batch", rt.QueryLogBatch)
-
-			// 数据库元数据接口
-			pages.POST("/db-databases", rt.ShowDatabases)
-			pages.POST("/db-tables", rt.ShowTables)
-			pages.POST("/db-desc-table", rt.DescribeTable)
-
-			// es 专用接口
-			pages.POST("/indices", rt.auth(), rt.user(), rt.QueryIndices)
-			pages.POST("/es-variable", rt.auth(), rt.user(), rt.QueryESVariable)
-			pages.POST("/fields", rt.auth(), rt.user(), rt.QueryFields)
-			pages.POST("/log-query", rt.auth(), rt.user(), rt.QueryLog)
 		} else {
 			pages.Any("/proxy/:id/*url", rt.auth(), rt.dsProxy)
 			pages.POST("/query-range-batch", rt.auth(), rt.promBatchQueryRange)
@@ -211,24 +201,11 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/datasource/query", rt.auth(), rt.user(), rt.datasourceQuery)
 
 			pages.POST("/ds-query", rt.auth(), rt.QueryData)
-			pages.POST("/logs-query", rt.auth(), rt.QueryLogV2)
+			pages.POST("/logs-query", rt.auth(), rt.QueryLog)
 
 			pages.POST("/tdengine-databases", rt.auth(), rt.tdengineDatabases)
 			pages.POST("/tdengine-tables", rt.auth(), rt.tdengineTables)
 			pages.POST("/tdengine-columns", rt.auth(), rt.tdengineColumns)
-
-			pages.POST("/log-query-batch", rt.auth(), rt.user(), rt.QueryLogBatch)
-
-			// 数据库元数据接口
-			pages.POST("/db-databases", rt.auth(), rt.user(), rt.ShowDatabases)
-			pages.POST("/db-tables", rt.auth(), rt.user(), rt.ShowTables)
-			pages.POST("/db-desc-table", rt.auth(), rt.user(), rt.DescribeTable)
-
-			// es 专用接口
-			pages.POST("/indices", rt.auth(), rt.user(), rt.QueryIndices)
-			pages.POST("/es-variable", rt.QueryESVariable)
-			pages.POST("/fields", rt.QueryFields)
-			pages.POST("/log-query", rt.QueryLog)
 		}
 
 		pages.GET("/sql-template", rt.QuerySqlTemplate)
@@ -259,16 +236,13 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/self/profile", rt.auth(), rt.user(), rt.selfProfileGet)
 		pages.PUT("/self/profile", rt.auth(), rt.user(), rt.selfProfilePut)
 		pages.PUT("/self/password", rt.auth(), rt.user(), rt.selfPasswordPut)
-		pages.GET("/self/token", rt.auth(), rt.user(), rt.getToken)
-		pages.POST("/self/token", rt.auth(), rt.user(), rt.addToken)
-		pages.DELETE("/self/token/:id", rt.auth(), rt.user(), rt.deleteToken)
 
 		pages.GET("/users", rt.auth(), rt.user(), rt.perm("/users"), rt.userGets)
-		pages.POST("/users", rt.auth(), rt.user(), rt.perm("/users/add"), rt.userAddPost)
+		pages.POST("/users", rt.auth(), rt.admin(), rt.userAddPost)
 		pages.GET("/user/:id/profile", rt.auth(), rt.userProfileGet)
-		pages.PUT("/user/:id/profile", rt.auth(), rt.user(), rt.perm("/users/put"), rt.userProfilePut)
-		pages.PUT("/user/:id/password", rt.auth(), rt.user(), rt.perm("/users/put"), rt.userPasswordPut)
-		pages.DELETE("/user/:id", rt.auth(), rt.user(), rt.perm("/users/del"), rt.userDel)
+		pages.PUT("/user/:id/profile", rt.auth(), rt.admin(), rt.userProfilePut)
+		pages.PUT("/user/:id/password", rt.auth(), rt.admin(), rt.userPasswordPut)
+		pages.DELETE("/user/:id", rt.auth(), rt.admin(), rt.userDel)
 
 		pages.GET("/metric-views", rt.auth(), rt.metricViewGets)
 		pages.DELETE("/metric-views", rt.auth(), rt.user(), rt.metricViewDel)
@@ -348,11 +322,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/share-charts", rt.chartShareGets)
 		pages.POST("/share-charts", rt.auth(), rt.chartShareAdd)
 
-		pages.POST("/dashboard-annotations", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.dashAnnotationAdd)
-		pages.GET("/dashboard-annotations", rt.dashAnnotationGets)
-		pages.PUT("/dashboard-annotation/:id", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.dashAnnotationPut)
-		pages.DELETE("/dashboard-annotation/:id", rt.auth(), rt.user(), rt.perm("/dashboards/del"), rt.dashAnnotationDel)
-
 		// pages.GET("/alert-rules/builtin/alerts-cates", rt.auth(), rt.user(), rt.builtinAlertCateGets)
 		// pages.GET("/alert-rules/builtin/list", rt.auth(), rt.user(), rt.builtinAlertRules)
 		pages.GET("/alert-rules/callbacks", rt.auth(), rt.user(), rt.alertRuleCallbacks)
@@ -371,7 +340,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/busi-group/alert-rule/validate", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRuleValidation)
 		pages.POST("/relabel-test", rt.auth(), rt.user(), rt.relabelTest)
 		pages.POST("/busi-group/:id/alert-rules/clone", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.cloneToMachine)
-		pages.POST("/busi-groups/alert-rules/clones", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.batchAlertRuleClone)
 
 		pages.GET("/busi-groups/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGetsByGids)
 		pages.GET("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGets)
@@ -389,7 +357,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/busi-group/:id/alert-mute/:amid", rt.auth(), rt.user(), rt.perm("/alert-mutes/put"), rt.alertMutePutByFE)
 		pages.GET("/busi-group/:id/alert-mute/:amid", rt.auth(), rt.user(), rt.perm("/alert-mutes"), rt.alertMuteGet)
 		pages.PUT("/busi-group/:id/alert-mutes/fields", rt.auth(), rt.user(), rt.perm("/alert-mutes/put"), rt.bgrw(), rt.alertMutePutFields)
-		pages.POST("/alert-mute-tryrun", rt.auth(), rt.user(), rt.perm("/alert-mutes/add"), rt.alertMuteTryRun)
 
 		pages.GET("/busi-groups/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes"), rt.alertSubscribeGetsByGids)
 		pages.GET("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes"), rt.bgro(), rt.alertSubscribeGets)
@@ -398,16 +365,21 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes/put"), rt.bgrw(), rt.alertSubscribePut)
 		pages.DELETE("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes/del"), rt.bgrw(), rt.alertSubscribeDel)
 
-		pages.GET("/alert-cur-event/:eid", rt.alertCurEventGet)
-		pages.GET("/alert-his-event/:eid", rt.alertHisEventGet)
-		pages.GET("/event-notify-records/:eid", rt.notificationRecordList)
+		if rt.Center.AnonymousAccess.AlertDetail {
+			pages.GET("/alert-cur-event/:eid", rt.alertCurEventGet)
+			pages.GET("/alert-his-event/:eid", rt.alertHisEventGet)
+			pages.GET("/event-notify-records/:eid", rt.notificationRecordList)
+		} else {
+			pages.GET("/alert-cur-event/:eid", rt.auth(), rt.user(), rt.alertCurEventGet)
+			pages.GET("/alert-his-event/:eid", rt.auth(), rt.user(), rt.alertHisEventGet)
+			pages.GET("/event-notify-records/:eid", rt.auth(), rt.user(), rt.notificationRecordList)
+		}
 
 		// card logic
 		pages.GET("/alert-cur-events/list", rt.auth(), rt.user(), rt.alertCurEventsList)
 		pages.GET("/alert-cur-events/card", rt.auth(), rt.user(), rt.alertCurEventsCard)
 		pages.POST("/alert-cur-events/card/details", rt.auth(), rt.alertCurEventsCardDetails)
 		pages.GET("/alert-his-events/list", rt.auth(), rt.user(), rt.alertHisEventsList)
-		pages.DELETE("/alert-his-events", rt.auth(), rt.admin(), rt.alertHisEventsDelete)
 		pages.DELETE("/alert-cur-events", rt.auth(), rt.user(), rt.perm("/alert-cur-events/del"), rt.alertCurEventDel)
 		pages.GET("/alert-cur-events/stats", rt.auth(), rt.alertCurEventsStatistics)
 
@@ -439,13 +411,13 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/datasource/status/update", rt.auth(), rt.admin(), rt.datasourceUpdataStatus)
 		pages.DELETE("/datasource/", rt.auth(), rt.admin(), rt.datasourceDel)
 
-		pages.GET("/roles", rt.auth(), rt.user(), rt.perm("/roles"), rt.roleGets)
-		pages.POST("/roles", rt.auth(), rt.user(), rt.perm("/roles/add"), rt.roleAdd)
-		pages.PUT("/roles", rt.auth(), rt.user(), rt.perm("/roles/put"), rt.rolePut)
-		pages.DELETE("/role/:id", rt.auth(), rt.user(), rt.perm("/roles/del"), rt.roleDel)
+		pages.GET("/roles", rt.auth(), rt.admin(), rt.roleGets)
+		pages.POST("/roles", rt.auth(), rt.admin(), rt.roleAdd)
+		pages.PUT("/roles", rt.auth(), rt.admin(), rt.rolePut)
+		pages.DELETE("/role/:id", rt.auth(), rt.admin(), rt.roleDel)
 
-		pages.GET("/role/:id/ops", rt.auth(), rt.user(), rt.perm("/roles"), rt.operationOfRole)
-		pages.PUT("/role/:id/ops", rt.auth(), rt.user(), rt.perm("/roles/put"), rt.roleBindOperation)
+		pages.GET("/role/:id/ops", rt.auth(), rt.admin(), rt.operationOfRole)
+		pages.PUT("/role/:id/ops", rt.auth(), rt.admin(), rt.roleBindOperation)
 		pages.GET("/operation", rt.operations)
 
 		pages.GET("/notify-tpls", rt.auth(), rt.user(), rt.notifyTplGets)
@@ -467,7 +439,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/notify-channel", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyChannelGets)
 		pages.PUT("/notify-channel", rt.auth(), rt.admin(), rt.notifyChannelPuts)
 
-		pages.GET("/notify-contact", rt.auth(), rt.user(), rt.notifyContactGets)
+		pages.GET("/notify-contact", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyContactGets)
 		pages.PUT("/notify-contact", rt.auth(), rt.admin(), rt.notifyContactPuts)
 
 		pages.GET("/notify-config", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyConfigGet)
@@ -476,20 +448,13 @@ func (rt *Router) Config(r *gin.Engine) {
 
 		pages.GET("/es-index-pattern", rt.auth(), rt.esIndexPatternGet)
 		pages.GET("/es-index-pattern-list", rt.auth(), rt.esIndexPatternGetList)
-		pages.POST("/es-index-pattern", rt.auth(), rt.user(), rt.perm("/log/index-patterns/add"), rt.esIndexPatternAdd)
-		pages.PUT("/es-index-pattern", rt.auth(), rt.user(), rt.perm("/log/index-patterns/put"), rt.esIndexPatternPut)
-		pages.DELETE("/es-index-pattern", rt.auth(), rt.user(), rt.perm("/log/index-patterns/del"), rt.esIndexPatternDel)
+		pages.POST("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternAdd)
+		pages.PUT("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternPut)
+		pages.DELETE("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternDel)
 
 		pages.GET("/embedded-dashboards", rt.auth(), rt.user(), rt.perm("/embedded-dashboards"), rt.embeddedDashboardsGet)
 		pages.PUT("/embedded-dashboards", rt.auth(), rt.user(), rt.perm("/embedded-dashboards/put"), rt.embeddedDashboardsPut)
 
-		// 获取 embedded-product 列表
-		pages.GET("/embedded-product", rt.auth(), rt.user(), rt.embeddedProductGets)
-		pages.GET("/embedded-product/:id", rt.auth(), rt.user(), rt.embeddedProductGet)
-		pages.POST("/embedded-product", rt.auth(), rt.user(), rt.perm("/embedded-product/add"), rt.embeddedProductAdd)
-		pages.PUT("/embedded-product/:id", rt.auth(), rt.user(), rt.perm("/embedded-product/put"), rt.embeddedProductPut)
-		pages.DELETE("/embedded-product/:id", rt.auth(), rt.user(), rt.perm("/embedded-product/delete"), rt.embeddedProductDelete)
-
 		pages.GET("/user-variable-configs", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigGets)
 		pages.POST("/user-variable-config", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigAdd)
 		pages.PUT("/user-variable-config/:id", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigPut)
@@ -499,59 +464,21 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/config", rt.auth(), rt.admin(), rt.configPutByKey)
 		pages.GET("/site-info", rt.siteInfo)
 
-		// source token 相关路由
-		pages.POST("/source-token", rt.auth(), rt.user(), rt.sourceTokenAdd)
-
 		// for admin api
 		pages.GET("/user/busi-groups", rt.auth(), rt.admin(), rt.userBusiGroupsGets)
 
 		pages.GET("/builtin-components", rt.auth(), rt.user(), rt.builtinComponentsGets)
-		pages.POST("/builtin-components", rt.auth(), rt.user(), rt.perm("/components/add"), rt.builtinComponentsAdd)
-		pages.PUT("/builtin-components", rt.auth(), rt.user(), rt.perm("/components/put"), rt.builtinComponentsPut)
-		pages.DELETE("/builtin-components", rt.auth(), rt.user(), rt.perm("/components/del"), rt.builtinComponentsDel)
+		pages.POST("/builtin-components", rt.auth(), rt.user(), rt.perm("/built-in-components/add"), rt.builtinComponentsAdd)
+		pages.PUT("/builtin-components", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinComponentsPut)
+		pages.DELETE("/builtin-components", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinComponentsDel)
 
 		pages.GET("/builtin-payloads", rt.auth(), rt.user(), rt.builtinPayloadsGets)
 		pages.GET("/builtin-payloads/cates", rt.auth(), rt.user(), rt.builtinPayloadcatesGet)
-		pages.POST("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/components/add"), rt.builtinPayloadsAdd)
-		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/components"), rt.builtinPayloadGet)
-		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/components/put"), rt.builtinPayloadsPut)
-		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/components/del"), rt.builtinPayloadsDel)
+		pages.POST("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/add"), rt.builtinPayloadsAdd)
+		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/built-in-components"), rt.builtinPayloadGet)
+		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinPayloadsPut)
+		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinPayloadsDel)
 		pages.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUIDOrID)
-
-		pages.POST("/message-templates", rt.auth(), rt.user(), rt.perm("/notification-templates/add"), rt.messageTemplatesAdd)
-		pages.DELETE("/message-templates", rt.auth(), rt.user(), rt.perm("/notification-templates/del"), rt.messageTemplatesDel)
-		pages.PUT("/message-template/:id", rt.auth(), rt.user(), rt.perm("/notification-templates/put"), rt.messageTemplatePut)
-		pages.GET("/message-template/:id", rt.auth(), rt.user(), rt.perm("/notification-templates"), rt.messageTemplateGet)
-		pages.GET("/message-templates", rt.auth(), rt.user(), rt.messageTemplatesGet)
-		pages.POST("/events-message", rt.auth(), rt.user(), rt.eventsMessage)
-
-		pages.POST("/notify-rules", rt.auth(), rt.user(), rt.perm("/notification-rules/add"), rt.notifyRulesAdd)
-		pages.DELETE("/notify-rules", rt.auth(), rt.user(), rt.perm("/notification-rules/del"), rt.notifyRulesDel)
-		pages.PUT("/notify-rule/:id", rt.auth(), rt.user(), rt.perm("/notification-rules/put"), rt.notifyRulePut)
-		pages.GET("/notify-rule/:id", rt.auth(), rt.user(), rt.perm("/notification-rules"), rt.notifyRuleGet)
-		pages.GET("/notify-rules", rt.auth(), rt.user(), rt.perm("/notification-rules"), rt.notifyRulesGet)
-		pages.POST("/notify-rule/test", rt.auth(), rt.user(), rt.perm("/notification-rules"), rt.notifyTest)
-		pages.GET("/notify-rule/custom-params", rt.auth(), rt.user(), rt.perm("/notification-rules"), rt.notifyRuleCustomParamsGet)
-		pages.POST("/notify-rule/event-pipelines-tryrun", rt.auth(), rt.user(), rt.perm("/notification-rules/add"), rt.tryRunEventProcessorByNotifyRule)
-
-		// 事件Pipeline相关路由
-		pages.GET("/event-pipelines", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.eventPipelinesList)
-		pages.POST("/event-pipeline", rt.auth(), rt.user(), rt.perm("/event-pipelines/add"), rt.addEventPipeline)
-		pages.PUT("/event-pipeline", rt.auth(), rt.user(), rt.perm("/event-pipelines/put"), rt.updateEventPipeline)
-		pages.GET("/event-pipeline/:id", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipeline)
-		pages.DELETE("/event-pipelines", rt.auth(), rt.user(), rt.perm("/event-pipelines/del"), rt.deleteEventPipelines)
-		pages.POST("/event-pipeline-tryrun", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.tryRunEventPipeline)
-		pages.POST("/event-processor-tryrun", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.tryRunEventProcessor)
-
-		pages.POST("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels/add"), rt.notifyChannelsAdd)
-		pages.DELETE("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels/del"), rt.notifyChannelsDel)
-		pages.PUT("/notify-channel-config/:id", rt.auth(), rt.user(), rt.perm("/notification-channels/put"), rt.notifyChannelPut)
-		pages.GET("/notify-channel-config/:id", rt.auth(), rt.user(), rt.perm("/notification-channels"), rt.notifyChannelGet)
-		pages.GET("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels"), rt.notifyChannelsGet)
-		pages.GET("/simplified-notify-channel-configs", rt.notifyChannelsGetForNormalUser)
-		pages.GET("/flashduty-channel-list/:id", rt.auth(), rt.user(), rt.flashDutyNotifyChannelsGet)
-		pages.GET("/notify-channel-config", rt.auth(), rt.user(), rt.notifyChannelGetBy)
-		pages.GET("/notify-channel-config/idents", rt.notifyChannelIdentsGet)
 	}
 
 	r.GET("/api/n9e/versions", func(c *gin.Context) {
@@ -594,8 +521,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.PUT("/targets/note", rt.targetUpdateNoteByService)
 			service.PUT("/targets/bgid", rt.targetUpdateBgidByService)
 
-			service.POST("/targets-of-host-query", rt.targetsOfHostQuery)
-
 			service.POST("/alert-rules", rt.alertRuleAddByService)
 			service.POST("/alert-rule-add", rt.alertRuleAddOneByService)
 			service.DELETE("/alert-rules", rt.alertRuleDelByService)
@@ -653,16 +578,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/alert-cur-events-del-by-hash", rt.alertCurEventDelByHash)
 
 			service.POST("/center/heartbeat", rt.heartbeat)
-
-			service.GET("/es-index-pattern-list", rt.esIndexPatternGetList)
-
-			service.GET("/notify-rules", rt.notifyRulesGetByService)
-
-			service.GET("/notify-channels", rt.notifyChannelConfigGets)
-
-			service.GET("/message-templates", rt.messageTemplateGets)
-
-			service.GET("/event-pipelines", rt.eventPipelinesListByService)
 		}
 	}
 

center/router/router_alert_cur_event.go

@@ -1,54 +1,50 @@
 package router
 
 import (
-	"fmt"
 	"net/http"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 )
 
-func getUserGroupIds(ctx *gin.Context, rt *Router, myGroups bool) ([]int64, error) {
-	if !myGroups {
-		return nil, nil
+func parseAggrRules(c *gin.Context) []*models.AggrRule {
+	aggrRules := strings.Split(ginx.QueryStr(c, "rule", ""), "::") // e.g. field:group_name::field:severity::tagkey:ident
+
+	if len(aggrRules) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "rule empty")
 	}
-	me := ctx.MustGet("user").(*models.User)
-	return models.MyGroupIds(rt.Ctx, me.Id)
+
+	rules := make([]*models.AggrRule, len(aggrRules))
+	for i := 0; i < len(aggrRules); i++ {
+		pair := strings.Split(aggrRules[i], ":")
+		if len(pair) != 2 {
+			ginx.Bomb(http.StatusBadRequest, "rule invalid")
+		}
+
+		if !(pair[0] == "field" || pair[0] == "tagkey") {
+			ginx.Bomb(http.StatusBadRequest, "rule invalid")
+		}
+
+		rules[i] = &models.AggrRule{
+			Type:  pair[0],
+			Value: pair[1],
+		}
+	}
+
+	return rules
 }
 
 func (rt *Router) alertCurEventsCard(c *gin.Context) {
 	stime, etime := getTimeRange(c)
-	severity := strx.IdsInt64ForAPI(ginx.QueryStr(c, "severity", ""), ",")
+	severity := ginx.QueryInt(c, "severity", -1)
 	query := ginx.QueryStr(c, "query", "")
-	myGroups := ginx.QueryBool(c, "my_groups", false) // 是否只看自己组，默认false
-
-	var gids []int64
-	var err error
-	if myGroups {
-		gids, err = getUserGroupIds(c, rt, myGroups)
-		ginx.Dangerous(err)
-		if len(gids) == 0 {
-			gids = append(gids, -1)
-		}
-	}
-
-	viewId := ginx.QueryInt64(c, "view_id")
-
-	alertView, err := models.GetAlertAggrViewByViewID(rt.Ctx, viewId)
-	ginx.Dangerous(err)
-
-	if alertView == nil {
-		ginx.Bomb(http.StatusNotFound, "alert aggr view not found")
-	}
-
 	dsIds := queryDatasourceIds(c)
+	rules := parseAggrRules(c)
 
 	prod := ginx.QueryStr(c, "prods", "")
 	if prod == "" {
@@ -65,18 +61,17 @@ func (rt *Router) alertCurEventsCard(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}
 
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView, myGroups)
+	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)
 
 	// 最多获取50000个，获取太多也没啥意义
 	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, 0, query, 50000, 0, []int64{})
+		cates, 0, query, 50000, 0)
 	ginx.Dangerous(err)
 
 	cardmap := make(map[string]*AlertCard)
 	for _, event := range list {
-		title, err := event.GenCardTitle(alertView.Rule)
-		ginx.Dangerous(err)
+		title := event.GenCardTitle(rules)
 		if _, has := cardmap[title]; has {
 			cardmap[title].Total++
 			cardmap[title].EventIds = append(cardmap[title].EventIds, event.Id)
@@ -91,10 +86,6 @@ func (rt *Router) alertCurEventsCard(c *gin.Context) {
 				Severity: event.Severity,
 			}
 		}
-
-		if cardmap[title].Severity < 1 {
-			cardmap[title].Severity = 3
-		}
 	}
 
 	titles := make([]string, 0, len(cardmap))
@@ -151,15 +142,11 @@ func (rt *Router) alertCurEventsGetByRid(c *gin.Context) {
 // 列表方式，拉取活跃告警
 func (rt *Router) alertCurEventsList(c *gin.Context) {
 	stime, etime := getTimeRange(c)
-	severity := strx.IdsInt64ForAPI(ginx.QueryStr(c, "severity", ""), ",")
+	severity := ginx.QueryInt(c, "severity", -1)
 	query := ginx.QueryStr(c, "query", "")
 	limit := ginx.QueryInt(c, "limit", 20)
-	myGroups := ginx.QueryBool(c, "my_groups", false) // 是否只看自己组，默认false
-
 	dsIds := queryDatasourceIds(c)
 
-	eventIds := strx.IdsInt64ForAPI(ginx.QueryStr(c, "event_ids", ""), ",")
-
 	prod := ginx.QueryStr(c, "prods", "")
 	if prod == "" {
 		prod = ginx.QueryStr(c, "rule_prods", "")
@@ -178,19 +165,18 @@ func (rt *Router) alertCurEventsList(c *gin.Context) {
 
 	ruleId := ginx.QueryInt64(c, "rid", 0)
 
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView, myGroups)
+	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)
 
 	total, err := models.AlertCurEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query, eventIds)
+		cates, ruleId, query)
 	ginx.Dangerous(err)
 
 	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query, limit, ginx.Offset(c, limit), eventIds)
+		cates, ruleId, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
 
 	cache := make(map[int64]*models.UserGroup)
-
 	for i := 0; i < len(list); i++ {
 		list[i].FillNotifyGroups(rt.Ctx, cache)
 	}
@@ -232,68 +218,24 @@ func (rt *Router) checkCurEventBusiGroupRWPermission(c *gin.Context, ids []int64
 
 func (rt *Router) alertCurEventGet(c *gin.Context) {
 	eid := ginx.UrlParamInt64(c, "eid")
-	event, err := GetCurEventDetail(rt.Ctx, eid)
+	event, err := models.AlertCurEventGetById(rt.Ctx, eid)
+	ginx.Dangerous(err)
 
-	hasPermission := HasPermission(rt.Ctx, c, "event", fmt.Sprintf("%d", eid), rt.Center.AnonymousAccess.AlertDetail)
-	if !hasPermission {
-		rt.auth()(c)
-		rt.user()(c)
+	if event == nil {
+		ginx.Bomb(404, "No such active event")
+	}
+
+	if !rt.Center.AnonymousAccess.AlertDetail && rt.Center.EventHistoryGroupView {
 		rt.bgroCheck(c, event.GroupId)
 	}
 
-	ginx.NewRender(c).Data(event, err)
-}
-
-func GetCurEventDetail(ctx *ctx.Context, eid int64) (*models.AlertCurEvent, error) {
-	event, err := models.AlertCurEventGetById(ctx, eid)
-	if err != nil {
-		return nil, err
-	}
-
-	if event == nil {
-		return nil, fmt.Errorf("no such active event")
-	}
-
-	ruleConfig, needReset := models.FillRuleConfigTplName(ctx, event.RuleConfig)
+	ruleConfig, needReset := models.FillRuleConfigTplName(rt.Ctx, event.RuleConfig)
 	if needReset {
 		event.RuleConfigJson = ruleConfig
 	}
 
 	event.LastEvalTime = event.TriggerTime
-	event.NotifyVersion, err = GetEventNotifyVersion(ctx, event.RuleId, event.NotifyRuleIds)
-	ginx.Dangerous(err)
-
-	event.NotifyRules, err = GetEventNorifyRuleNames(ctx, event.NotifyRuleIds)
-	return event, err
-}
-
-func GetEventNorifyRuleNames(ctx *ctx.Context, notifyRuleIds []int64) ([]*models.EventNotifyRule, error) {
-	notifyRuleNames := make([]*models.EventNotifyRule, 0)
-	notifyRules, err := models.NotifyRulesGet(ctx, "id in ?", notifyRuleIds)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, notifyRule := range notifyRules {
-		notifyRuleNames = append(notifyRuleNames, &models.EventNotifyRule{
-			Id:   notifyRule.ID,
-			Name: notifyRule.Name,
-		})
-	}
-	return notifyRuleNames, nil
-}
-
-func GetEventNotifyVersion(ctx *ctx.Context, ruleId int64, notifyRuleIds []int64) (int, error) {
-	if len(notifyRuleIds) != 0 {
-		// 如果存在 notify_rule_ids，则认为使用新的告警通知方式
-		return 1, nil
-	}
-
-	rule, err := models.AlertRuleGetById(ctx, ruleId)
-	if err != nil {
-		return 0, err
-	}
-	return rule.NotifyVersion, nil
+	ginx.NewRender(c).Data(event, nil)
 }
 
 func (rt *Router) alertCurEventsStatistics(c *gin.Context) {

center/router/router_alert_his_event.go

@@ -2,7 +2,6 @@ package router
 
 import (
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -11,7 +10,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
 	"golang.org/x/exp/slices"
 )
 
@@ -58,7 +56,7 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 
 	ruleId := ginx.QueryInt64(c, "rid", 0)
 
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView, false)
+	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)
 
 	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity,
@@ -80,56 +78,16 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 	}, nil)
 }
 
-type alertHisEventsDeleteForm struct {
-	Severities []int `json:"severities"`
-	Timestamp  int64 `json:"timestamp" binding:"required"`
-}
-
-func (rt *Router) alertHisEventsDelete(c *gin.Context) {
-	var f alertHisEventsDeleteForm
-	ginx.BindJSON(c, &f)
-	// 校验
-	if f.Timestamp == 0 {
-		ginx.Bomb(http.StatusBadRequest, "timestamp parameter is required")
-		return
-	}
-
-	user := c.MustGet("user").(*models.User)
-
-	// 启动后台清理任务
-	go func() {
-		limit := 100
-		for {
-			n, err := models.AlertHisEventBatchDelete(rt.Ctx, f.Timestamp, f.Severities, limit)
-			if err != nil {
-				logger.Errorf("Failed to delete alert history events: operator=%s, timestamp=%d, severities=%v, error=%v",
-					user.Username, f.Timestamp, f.Severities, err)
-				break
-			}
-			logger.Debugf("Successfully deleted alert history events: operator=%s, timestamp=%d, severities=%v, deleted=%d",
-				user.Username, f.Timestamp, f.Severities, n)
-			if n < int64(limit) {
-				break // 已经删完
-			}
-
-			time.Sleep(100 * time.Millisecond) // 防止锁表
-		}
-	}()
-	ginx.NewRender(c).Message("Alert history events deletion started")
-}
-
 func (rt *Router) alertHisEventGet(c *gin.Context) {
 	eid := ginx.UrlParamInt64(c, "eid")
 	event, err := models.AlertHisEventGetById(rt.Ctx, eid)
 	ginx.Dangerous(err)
+
 	if event == nil {
 		ginx.Bomb(404, "No such alert event")
 	}
 
-	hasPermission := HasPermission(rt.Ctx, c, "event", fmt.Sprintf("%d", eid), rt.Center.AnonymousAccess.AlertDetail)
-	if !hasPermission {
-		rt.auth()(c)
-		rt.user()(c)
+	if !rt.Center.AnonymousAccess.AlertDetail && rt.Center.EventHistoryGroupView {
 		rt.bgroCheck(c, event.GroupId)
 	}
 
@@ -138,54 +96,46 @@ func (rt *Router) alertHisEventGet(c *gin.Context) {
 		event.RuleConfigJson = ruleConfig
 	}
 
-	event.NotifyVersion, err = GetEventNotifyVersion(rt.Ctx, event.RuleId, event.NotifyRuleIds)
-	ginx.Dangerous(err)
-
-	event.NotifyRules, err = GetEventNorifyRuleNames(rt.Ctx, event.NotifyRuleIds)
 	ginx.NewRender(c).Data(event, err)
 }
 
-func GetBusinessGroupIds(c *gin.Context, ctx *ctx.Context, onlySelfGroupView bool, myGroups bool) ([]int64, error) {
+func GetBusinessGroupIds(c *gin.Context, ctx *ctx.Context, eventHistoryGroupView bool) ([]int64, error) {
 	bgid := ginx.QueryInt64(c, "bgid", 0)
 	var bgids []int64
 
-	if strings.HasPrefix(c.Request.URL.Path, "/v1") {
-		// 如果请求路径以 /v1 开头，不查询用户信息
+	if !eventHistoryGroupView || strings.HasPrefix(c.Request.URL.Path, "/v1") {
 		if bgid > 0 {
 			return []int64{bgid}, nil
 		}
-
 		return bgids, nil
 	}
 
 	user := c.MustGet("user").(*models.User)
-	if myGroups || (onlySelfGroupView && !user.IsAdmin()) {
-		// 1. 页面上勾选了我的业务组，需要查询用户所属的业务组
-		// 2. 如果 onlySelfGroupView 为 true，表示只允许查询用户所属的业务组
-		bussGroupIds, err := models.MyBusiGroupIds(ctx, user.Id)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(bussGroupIds) == 0 {
-			// 如果没查到用户属于任何业务组，需要返回一个0，否则会导致查询到全部告警历史
-			return []int64{0}, nil
-		}
-
+	if user.IsAdmin() {
 		if bgid > 0 {
-			if !slices.Contains(bussGroupIds, bgid) && !user.IsAdmin() {
-				return nil, fmt.Errorf("business group ID not allowed")
-			}
-
 			return []int64{bgid}, nil
 		}
+		return bgids, nil
+	}
 
-		return bussGroupIds, nil
+	bussGroupIds, err := models.MyBusiGroupIds(ctx, user.Id)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(bussGroupIds) == 0 {
+		// 如果没查到用户属于任何业务组，需要返回一个0，否则会导致查询到全部告警历史
+		return []int64{0}, nil
+	}
+
+	if bgid > 0 && !slices.Contains(bussGroupIds, bgid) {
+		return nil, fmt.Errorf("business group ID not allowed")
 	}
 
 	if bgid > 0 {
+		// Pass filter parameters, priority to use
 		return []int64{bgid}, nil
 	}
 
-	return bgids, nil
+	return bussGroupIds, nil
 }

center/router/router_alert_rule.go

@@ -12,7 +12,6 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 
@@ -21,10 +20,9 @@ import (
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
+	"github.com/toolkits/pkg/str"
 )
 
-type AlertRuleModifyHookFunc func(ar *models.AlertRule)
-
 // Return all, front-end search and paging
 func (rt *Router) alertRuleGets(c *gin.Context) {
 	busiGroupId := ginx.UrlParamInt64(c, "id")
@@ -52,7 +50,7 @@ func getAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
 }
 
 func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
 		for _, gid := range gids {
 			rt.bgroCheck(c, gid)
@@ -428,16 +426,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 		}
 
 		for k, v := range f.Fields {
-			// 检查 v 是否为各种切片类型
-			switch v.(type) {
-			case []interface{}, []int64, []int, []string:
-				// 将切片转换为 JSON 字符串
-				bytes, err := json.Marshal(v)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, string(bytes)))
-			default:
-				ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, v))
-			}
+			ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, v))
 		}
 	}
 
@@ -462,7 +451,6 @@ func (rt *Router) alertRuleGet(c *gin.Context) {
 	err = ar.FillNotifyGroups(rt.Ctx, make(map[int64]*models.UserGroup))
 	ginx.Dangerous(err)
 
-	rt.AlertRuleModifyHook(ar)
 	ginx.NewRender(c).Data(ar, err)
 }
 
@@ -687,49 +675,3 @@ func (rt *Router) cloneToMachine(c *gin.Context) {
 
 	ginx.NewRender(c).Data(reterr, models.InsertAlertRule(rt.Ctx, newRules))
 }
-
-type alertBatchCloneForm struct {
-	RuleIds []int64 `json:"rule_ids"`
-	Bgids   []int64 `json:"bgids"`
-}
-
-// 批量克隆告警规则
-func (rt *Router) batchAlertRuleClone(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-
-	var f alertBatchCloneForm
-	ginx.BindJSON(c, &f)
-
-	// 校验 bgids 操作权限
-	for _, bgid := range f.Bgids {
-		rt.bgrwCheck(c, bgid)
-	}
-
-	reterr := make(map[string]string, len(f.RuleIds))
-	lang := c.GetHeader("X-Language")
-
-	for _, arid := range f.RuleIds {
-		ar, err := models.AlertRuleGetById(rt.Ctx, arid)
-		for _, bgid := range f.Bgids {
-			// 为了让 bgid 和 arid 对应，将上面的 err 放到这里处理
-			if err != nil {
-				reterr[fmt.Sprintf("%d-%d", arid, bgid)] = i18n.Sprintf(lang, err.Error())
-				continue
-			}
-
-			if ar == nil {
-				reterr[fmt.Sprintf("%d-%d", arid, bgid)] = i18n.Sprintf(lang, "alert rule not found")
-				continue
-			}
-
-			newAr := ar.Clone(me.Username, bgid)
-			err = newAr.Add(rt.Ctx)
-			if err != nil {
-				reterr[fmt.Sprintf("%d-%d", arid, bgid)] = i18n.Sprintf(lang, err.Error())
-				continue
-			}
-		}
-	}
-
-	ginx.NewRender(c).Data(reterr, nil)
-}

center/router/router_alert_subscribe.go

@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/str"
 )
 
 // Return all, front-end search and paging
@@ -31,7 +31,7 @@ func (rt *Router) alertSubscribeGets(c *gin.Context) {
 }
 
 func (rt *Router) alertSubscribeGetsByGids(c *gin.Context) {
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
 		for _, gid := range gids {
 			rt.bgroCheck(c, gid)
@@ -141,7 +141,6 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"extra_config",
 			"busi_groups",
 			"note",
-			"notify_rule_ids",
 		))
 	}
 

center/router/router_board.go

@@ -6,11 +6,11 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
+	"github.com/toolkits/pkg/str"
 )
 
 type boardForm struct {
@@ -51,14 +51,9 @@ func (rt *Router) boardAdd(c *gin.Context) {
 
 func (rt *Router) boardGet(c *gin.Context) {
 	bid := ginx.UrlParamStr(c, "bid")
-	board, err := models.BoardGet(rt.Ctx, "ident = ?", bid)
+	board, err := models.BoardGet(rt.Ctx, "id = ? or ident = ?", bid, bid)
 	ginx.Dangerous(err)
 
-	if board == nil {
-		board, err = models.BoardGet(rt.Ctx, "id = ?", bid)
-		ginx.Dangerous(err)
-	}
-
 	if board == nil {
 		ginx.Bomb(http.StatusNotFound, "No such dashboard")
 	}
@@ -101,7 +96,7 @@ func (rt *Router) boardGet(c *gin.Context) {
 
 // 根据 bids 参数，获取多个 board
 func (rt *Router) boardGetsByBids(c *gin.Context) {
-	bids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "bids", ""), ",")
+	bids := str.IdsInt64(ginx.QueryStr(c, "bids", ""), ",")
 	boards, err := models.BoardGetsByBids(rt.Ctx, bids)
 	ginx.Dangerous(err)
 	ginx.NewRender(c).Data(boards, err)
@@ -270,7 +265,7 @@ func (rt *Router) publicBoardGets(c *gin.Context) {
 }
 
 func (rt *Router) boardGetsByGids(c *gin.Context) {
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	query := ginx.QueryStr(c, "query", "")
 
 	if len(gids) > 0 {

center/router/router_builtin_componet.go

@@ -36,9 +36,8 @@ func (rt *Router) builtinComponentsAdd(c *gin.Context) {
 
 func (rt *Router) builtinComponentsGets(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
 
-	bc, err := models.BuiltinComponentGets(rt.Ctx, query, disabled)
+	bc, err := models.BuiltinComponentGets(rt.Ctx, query)
 	ginx.Dangerous(err)
 
 	ginx.NewRender(c).Data(bc, nil)

center/router/router_builtin_metric_filter.go

@@ -57,7 +57,7 @@ func (rt *Router) metricFilterDel(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if !HasPerm(gids, old.GroupsPerm, true) {
-				ginx.NewRender(c).Message("forbidden")
+				ginx.NewRender(c).Message("no permission")
 				return
 			}
 		}
@@ -79,7 +79,7 @@ func (rt *Router) metricFilterPut(c *gin.Context) {
 		ginx.Dangerous(err)
 
 		if !HasPerm(gids, old.GroupsPerm, true) {
-			ginx.NewRender(c).Message("forbidden")
+			ginx.NewRender(c).Message("no permission")
 			return
 		}
 	}

center/router/router_builtin_metrics.go

@@ -86,11 +86,15 @@ func (rt *Router) builtinMetricsDel(c *gin.Context) {
 func (rt *Router) builtinMetricsDefaultTypes(c *gin.Context) {
 	lst := []string{
 		"Linux",
-		"Procstat",
 		"cAdvisor",
 		"Ping",
 		"MySQL",
-		"ClickHouse",
+		"Redis",
+		"Kafka",
+		"Elasticsearch",
+		"PostgreSQL",
+		"MongoDB",
+		"Memcached",
 	}
 	ginx.NewRender(c).Data(lst, nil)
 }
@@ -100,8 +104,7 @@ func (rt *Router) builtinMetricsTypes(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
 	lang := c.GetHeader("X-Language")
 
-	metricTypeList, err := models.BuiltinMetricTypes(rt.Ctx, lang, collector, query)
-	ginx.NewRender(c).Data(metricTypeList, err)
+	ginx.NewRender(c).Data(models.BuiltinMetricTypes(rt.Ctx, lang, collector, query))
 }
 
 func (rt *Router) builtinMetricsCollectors(c *gin.Context) {

center/router/router_busi_group.go

@@ -4,11 +4,11 @@ import (
 	"net/http"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/str"
 )
 
 type busiGroupForm struct {
@@ -131,7 +131,7 @@ func (rt *Router) busiGroupGetsByService(c *gin.Context) {
 // 这个接口只有在活跃告警页面才调用，获取各个BG的活跃告警数量
 func (rt *Router) busiGroupAlertingsGets(c *gin.Context) {
 	ids := ginx.QueryStr(c, "ids", "")
-	ret, err := models.AlertNumbers(rt.Ctx, strx.IdsInt64ForAPI(ids))
+	ret, err := models.AlertNumbers(rt.Ctx, str.IdsInt64(ids))
 	ginx.NewRender(c).Data(ret, err)
 }
 
@@ -142,7 +142,7 @@ func (rt *Router) busiGroupGet(c *gin.Context) {
 }
 
 func (rt *Router) busiGroupsGetTags(c *gin.Context) {
-	bgids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	bgids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	targetIdents, err := models.TargetIndentsGetByBgids(rt.Ctx, bgids)
 	ginx.Dangerous(err)
 	tags, err := models.TargetGetTags(rt.Ctx, targetIdents, true, "busigroup")

center/router/router_chart_share.go

@@ -4,15 +4,15 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/str"
 )
 
 func (rt *Router) chartShareGets(c *gin.Context) {
 	ids := ginx.QueryStr(c, "ids", "")
-	lst, err := models.ChartShareGetsByIds(rt.Ctx, strx.IdsInt64ForAPI(ids, ","))
+	lst, err := models.ChartShareGetsByIds(rt.Ctx, str.IdsInt64(ids, ","))
 	ginx.NewRender(c).Data(lst, err)
 }
 

center/router/router_dash_annotation.go

@@ -1,99 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func checkAnnotationPermission(c *gin.Context, ctx *ctx.Context, dashboardId int64) {
-	dashboard, err := models.BoardGetByID(ctx, dashboardId)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "failed to get dashboard: %v", err)
-	}
-
-	if dashboard == nil {
-		ginx.Bomb(http.StatusNotFound, "dashboard not found")
-	}
-
-	bg := BusiGroup(ctx, dashboard.GroupId)
-	me := c.MustGet("user").(*models.User)
-	can, err := me.CanDoBusiGroup(ctx, bg, "rw")
-	ginx.Dangerous(err)
-
-	if !can {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
-	}
-}
-
-func (rt *Router) dashAnnotationAdd(c *gin.Context) {
-	var f models.DashAnnotation
-	ginx.BindJSON(c, &f)
-
-	username := c.MustGet("username").(string)
-	now := time.Now().Unix()
-
-	checkAnnotationPermission(c, rt.Ctx, f.DashboardId)
-
-	f.CreateBy = username
-	f.CreateAt = now
-	f.UpdateBy = username
-	f.UpdateAt = now
-
-	ginx.NewRender(c).Data(f.Id, f.Add(rt.Ctx))
-}
-
-func (rt *Router) dashAnnotationGets(c *gin.Context) {
-	dashboardId := ginx.QueryInt64(c, "dashboard_id")
-	from := ginx.QueryInt64(c, "from")
-	to := ginx.QueryInt64(c, "to")
-	limit := ginx.QueryInt(c, "limit", 100)
-
-	lst, err := models.DashAnnotationGets(rt.Ctx, dashboardId, from, to, limit)
-	ginx.NewRender(c).Data(lst, err)
-}
-
-func (rt *Router) dashAnnotationPut(c *gin.Context) {
-	var f models.DashAnnotation
-	ginx.BindJSON(c, &f)
-
-	id := ginx.UrlParamInt64(c, "id")
-	annotation, err := getAnnotationById(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	checkAnnotationPermission(c, rt.Ctx, annotation.DashboardId)
-
-	f.Id = id
-	f.UpdateAt = time.Now().Unix()
-	f.UpdateBy = c.MustGet("username").(string)
-
-	ginx.NewRender(c).Message(f.Update(rt.Ctx))
-}
-
-func (rt *Router) dashAnnotationDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	annotation, err := getAnnotationById(rt.Ctx, id)
-	ginx.Dangerous(err)
-	checkAnnotationPermission(c, rt.Ctx, annotation.DashboardId)
-
-	ginx.NewRender(c).Message(models.DashAnnotationDel(rt.Ctx, id))
-}
-
-// 可以提取获取注释的通用方法
-func getAnnotationById(ctx *ctx.Context, id int64) (*models.DashAnnotation, error) {
-	annotation, err := models.DashAnnotationGet(ctx, "id=?", id)
-	if err != nil {
-		return nil, err
-	}
-	if annotation == nil {
-		return nil, fmt.Errorf("annotation not found")
-	}
-	return annotation, nil
-}

center/router/router_datasource.go

@@ -57,21 +57,15 @@ func (rt *Router) datasourceBriefs(c *gin.Context) {
 
 	for _, item := range list {
 		item.AuthJson.BasicAuthPassword = ""
-		if item.PluginType == models.PROMETHEUS {
+		if item.PluginType != models.PROMETHEUS {
+			item.SettingsJson = nil
+		} else {
 			for k, v := range item.SettingsJson {
 				if strings.HasPrefix(k, "prometheus.") {
 					item.SettingsJson[strings.TrimPrefix(k, "prometheus.")] = v
 					delete(item.SettingsJson, k)
 				}
 			}
-		} else if item.PluginType == "cloudwatch" {
-			for k := range item.SettingsJson {
-				if !strings.Contains(k, "region") {
-					delete(item.SettingsJson, k)
-				}
-			}
-		} else {
-			item.SettingsJson = nil
 		}
 		dss = append(dss, item)
 	}
@@ -99,12 +93,10 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 	var count int64
 
 	if !req.ForceSave {
-		if req.PluginType == models.PROMETHEUS || req.PluginType == models.LOKI || req.PluginType == models.TDENGINE {
-			err = DatasourceCheck(req)
-			if err != nil {
-				Dangerous(c, err)
-				return
-			}
+		err = DatasourceCheck(req)
+		if err != nil {
+			Dangerous(c, err)
+			return
 		}
 	}
 
@@ -123,14 +115,14 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 		}
 		err = req.Add(rt.Ctx)
 	} else {
-		err = req.Update(rt.Ctx, "name", "identifier", "description", "cluster_name", "settings", "http", "auth", "updated_by", "updated_at", "is_default")
+		err = req.Update(rt.Ctx, "name", "description", "cluster_name", "settings", "http", "auth", "updated_by", "updated_at", "is_default")
 	}
 
 	Render(c, nil, err)
 }
 
 func DatasourceCheck(ds models.Datasource) error {
-	if ds.PluginType == models.PROMETHEUS || ds.PluginType == models.LOKI || ds.PluginType == models.TDENGINE {
+	if ds.PluginType != models.ELASTICSEARCH {
 		if ds.HTTPJson.Url == "" {
 			return fmt.Errorf("url is empty")
 		}
@@ -148,12 +140,11 @@ func DatasourceCheck(ds models.Datasource) error {
 		},
 	}
 
-	ds.HTTPJson.Url = strings.TrimRight(ds.HTTPJson.Url, "/")
 	var fullURL string
 	req, err := ds.HTTPJson.NewReq(&fullURL)
 	if err != nil {
 		logger.Errorf("Error creating request: %v", err)
-		return fmt.Errorf("request urls:%v failed: %v", ds.HTTPJson.GetUrls(), err)
+		return fmt.Errorf("request urls:%v failed", ds.HTTPJson.GetUrls())
 	}
 
 	if ds.PluginType == models.PROMETHEUS {
@@ -169,14 +160,14 @@ func DatasourceCheck(ds models.Datasource) error {
 		req, err = http.NewRequest("GET", fullURL, nil)
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+			return fmt.Errorf("request url:%s failed", fullURL)
 		}
 	} else if ds.PluginType == models.TDENGINE {
 		fullURL = fmt.Sprintf("%s/rest/sql", ds.HTTPJson.Url)
 		req, err = http.NewRequest("POST", fullURL, strings.NewReader("show databases"))
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+			return fmt.Errorf("request url:%s failed", fullURL)
 		}
 	}
 
@@ -188,7 +179,7 @@ func DatasourceCheck(ds models.Datasource) error {
 		req, err = http.NewRequest("GET", fullURL, nil)
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+			return fmt.Errorf("request url:%s failed", fullURL)
 		}
 	}
 
@@ -203,7 +194,7 @@ func DatasourceCheck(ds models.Datasource) error {
 	resp, err := client.Do(req)
 	if err != nil {
 		logger.Errorf("Error making request: %v\n", err)
-		return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+		return fmt.Errorf("request url:%s failed", fullURL)
 	}
 	defer resp.Body.Close()
 

center/router/router_datasource_db.go

@@ -1,101 +0,0 @@
-package router
-
-import (
-	"context"
-
-	"github.com/ccfos/nightingale/v6/dscache"
-	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/models"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-func (rt *Router) ShowDatabases(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	var databases []string
-	var err error
-	type DatabaseShower interface {
-		ShowDatabases(context.Context) ([]string, error)
-	}
-	switch plug.(type) {
-	case DatabaseShower:
-		databases, err = plug.(DatabaseShower).ShowDatabases(c.Request.Context())
-		ginx.Dangerous(err)
-	default:
-		ginx.Bomb(200, "datasource not exists")
-	}
-
-	if len(databases) == 0 {
-		databases = make([]string, 0)
-	}
-
-	ginx.NewRender(c).Data(databases, nil)
-}
-
-func (rt *Router) ShowTables(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	// 只接受一个入参
-	tables := make([]string, 0)
-	var err error
-	type TableShower interface {
-		ShowTables(ctx context.Context, database string) ([]string, error)
-	}
-	switch plug.(type) {
-	case TableShower:
-		if len(f.Querys) > 0 {
-			database, ok := f.Querys[0].(string)
-			if ok {
-				tables, err = plug.(TableShower).ShowTables(c.Request.Context(), database)
-			}
-		}
-	default:
-		ginx.Bomb(200, "datasource not exists")
-	}
-	ginx.NewRender(c).Data(tables, err)
-}
-
-func (rt *Router) DescribeTable(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-	// 只接受一个入参
-	columns := make([]*types.ColumnProperty, 0)
-	var err error
-	type TableDescriber interface {
-		DescribeTable(context.Context, interface{}) ([]*types.ColumnProperty, error)
-	}
-	switch plug.(type) {
-	case TableDescriber:
-		client := plug.(TableDescriber)
-		if len(f.Querys) > 0 {
-			columns, err = client.DescribeTable(c.Request.Context(), f.Querys[0])
-		}
-	default:
-		ginx.Bomb(200, "datasource not exists")
-	}
-
-	ginx.NewRender(c).Data(columns, err)
-}

center/router/router_embedded.go

@@ -1,141 +0,0 @@
-package router
-
-import (
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func (rt *Router) embeddedProductGets(c *gin.Context) {
-	products, err := models.EmbeddedProductGets(rt.Ctx)
-	ginx.Dangerous(err)
-	// 获取当前用户可访问的Group ID 列表
-	me := c.MustGet("user").(*models.User)
-
-	if me.IsAdmin() {
-		ginx.NewRender(c).Data(products, err)
-		return
-	}
-
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	bgSet := make(map[int64]struct{}, len(gids))
-	for _, id := range gids {
-		bgSet[id] = struct{}{}
-	}
-
-	// 过滤出公开或有权限访问的私有 product link
-	var result []*models.EmbeddedProduct
-	for _, product := range products {
-		if !product.IsPrivate {
-			result = append(result, product)
-			continue
-		}
-
-		for _, tid := range product.TeamIDs {
-			if _, ok := bgSet[tid]; ok {
-				result = append(result, product)
-				break
-			}
-		}
-	}
-
-	ginx.NewRender(c).Data(result, err)
-}
-
-func (rt *Router) embeddedProductGet(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	if id <= 0 {
-		ginx.Bomb(400, "invalid id")
-	}
-
-	data, err := models.GetEmbeddedProductByID(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	me := c.MustGet("user").(*models.User)
-	hashPermission, err := hasEmbeddedProductAccess(rt.Ctx, me, data)
-	ginx.Dangerous(err)
-
-	if !hashPermission {
-		ginx.Bomb(403, "forbidden")
-	}
-
-	ginx.NewRender(c).Data(data, nil)
-}
-
-func (rt *Router) embeddedProductAdd(c *gin.Context) {
-	var eps []models.EmbeddedProduct
-	ginx.BindJSON(c, &eps)
-
-	me := c.MustGet("user").(*models.User)
-
-	for i := range eps {
-		eps[i].CreateBy = me.Nickname
-		eps[i].UpdateBy = me.Nickname
-	}
-
-	err := models.AddEmbeddedProduct(rt.Ctx, eps)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) embeddedProductPut(c *gin.Context) {
-	var ep models.EmbeddedProduct
-	id := ginx.UrlParamInt64(c, "id")
-	ginx.BindJSON(c, &ep)
-
-	if id <= 0 {
-		ginx.Bomb(400, "invalid id")
-	}
-
-	oldProduct, err := models.GetEmbeddedProductByID(rt.Ctx, id)
-	ginx.Dangerous(err)
-	me := c.MustGet("user").(*models.User)
-
-	now := time.Now().Unix()
-	oldProduct.Name = ep.Name
-	oldProduct.URL = ep.URL
-	oldProduct.IsPrivate = ep.IsPrivate
-	oldProduct.TeamIDs = ep.TeamIDs
-	oldProduct.UpdateBy = me.Username
-	oldProduct.UpdateAt = now
-
-	err = models.UpdateEmbeddedProduct(rt.Ctx, oldProduct)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) embeddedProductDelete(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	if id <= 0 {
-		ginx.Bomb(400, "invalid id")
-	}
-
-	err := models.DeleteEmbeddedProduct(rt.Ctx, id)
-	ginx.NewRender(c).Message(err)
-}
-
-func hasEmbeddedProductAccess(ctx *ctx.Context, user *models.User, ep *models.EmbeddedProduct) (bool, error) {
-	if user.IsAdmin() || !ep.IsPrivate {
-		return true, nil
-	}
-
-	gids, err := models.MyGroupIds(ctx, user.Id)
-	if err != nil {
-		return false, err
-	}
-
-	groupSet := make(map[int64]struct{}, len(gids))
-	for _, gid := range gids {
-		groupSet[gid] = struct{}{}
-	}
-
-	for _, tid := range ep.TeamIDs {
-		if _, ok := groupSet[tid]; ok {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}

center/router/router_es.go

@@ -1,77 +0,0 @@
-package router
-
-import (
-	"github.com/ccfos/nightingale/v6/datasource/es"
-	"github.com/ccfos/nightingale/v6/dscache"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-type IndexReq struct {
-	Cate         string `json:"cate"`
-	DatasourceId int64  `json:"datasource_id"`
-	Index        string `json:"index"`
-}
-
-type FieldValueReq struct {
-	Cate         string   `json:"cate"`
-	DatasourceId int64    `json:"datasource_id"`
-	Index        string   `json:"index"`
-	Query        FieldObj `json:"query"`
-}
-
-type FieldObj struct {
-	Find  string `json:"find"`
-	Field string `json:"field"`
-	Query string `json:"query"`
-}
-
-func (rt *Router) QueryIndices(c *gin.Context) {
-	var f IndexReq
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	indices, err := plug.(*es.Elasticsearch).QueryIndices()
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(indices, nil)
-}
-
-func (rt *Router) QueryFields(c *gin.Context) {
-	var f IndexReq
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	fields, err := plug.(*es.Elasticsearch).QueryFields([]string{f.Index})
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(fields, nil)
-}
-
-func (rt *Router) QueryESVariable(c *gin.Context) {
-	var f FieldValueReq
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	fields, err := plug.(*es.Elasticsearch).QueryFieldValue([]string{f.Index}, f.Query.Field, f.Query.Query)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(fields, nil)
-}

center/router/router_event_pipeline.go

@@ -1,245 +0,0 @@
-package router
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-// 获取事件Pipeline列表
-func (rt *Router) eventPipelinesList(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	pipelines, err := models.ListEventPipelines(rt.Ctx)
-	ginx.Dangerous(err)
-
-	allTids := make([]int64, 0)
-	for _, pipeline := range pipelines {
-		allTids = append(allTids, pipeline.TeamIds...)
-	}
-	ugMap, err := models.UserGroupIdAndNameMap(rt.Ctx, allTids)
-	ginx.Dangerous(err)
-	for _, pipeline := range pipelines {
-		for _, tid := range pipeline.TeamIds {
-			pipeline.TeamNames = append(pipeline.TeamNames, ugMap[tid])
-		}
-	}
-
-	gids, err := models.MyGroupIdsMap(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	if me.IsAdmin() {
-		ginx.NewRender(c).Data(pipelines, nil)
-		return
-	}
-
-	res := make([]*models.EventPipeline, 0)
-	for _, pipeline := range pipelines {
-		for _, tid := range pipeline.TeamIds {
-			if _, ok := gids[tid]; ok {
-				res = append(res, pipeline)
-				break
-			}
-		}
-	}
-
-	ginx.NewRender(c).Data(res, nil)
-}
-
-// 获取单个事件Pipeline详情
-func (rt *Router) getEventPipeline(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	id := ginx.UrlParamInt64(c, "id")
-	pipeline, err := models.GetEventPipeline(rt.Ctx, id)
-	ginx.Dangerous(err)
-	ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-
-	err = pipeline.FillTeamNames(rt.Ctx)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(pipeline, nil)
-}
-
-// 创建事件Pipeline
-func (rt *Router) addEventPipeline(c *gin.Context) {
-	var pipeline models.EventPipeline
-	ginx.BindJSON(c, &pipeline)
-
-	user := c.MustGet("user").(*models.User)
-	now := time.Now().Unix()
-	pipeline.CreateBy = user.Username
-	pipeline.CreateAt = now
-	pipeline.UpdateAt = now
-	pipeline.UpdateBy = user.Username
-
-	err := pipeline.Verify()
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
-
-	ginx.Dangerous(user.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-	err = models.CreateEventPipeline(rt.Ctx, &pipeline)
-	ginx.NewRender(c).Message(err)
-}
-
-// 更新事件Pipeline
-func (rt *Router) updateEventPipeline(c *gin.Context) {
-	var f models.EventPipeline
-	ginx.BindJSON(c, &f)
-
-	me := c.MustGet("user").(*models.User)
-	f.UpdateBy = me.Username
-	f.UpdateAt = time.Now().Unix()
-
-	pipeline, err := models.GetEventPipeline(rt.Ctx, f.ID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "No such event pipeline")
-	}
-	ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-
-	ginx.NewRender(c).Message(pipeline.Update(rt.Ctx, &f))
-}
-
-// 删除事件Pipeline
-func (rt *Router) deleteEventPipelines(c *gin.Context) {
-	var f struct {
-		Ids []int64 `json:"ids"`
-	}
-	ginx.BindJSON(c, &f)
-
-	if len(f.Ids) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "ids required")
-	}
-
-	me := c.MustGet("user").(*models.User)
-	for _, id := range f.Ids {
-		pipeline, err := models.GetEventPipeline(rt.Ctx, id)
-		ginx.Dangerous(err)
-		ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-	}
-
-	err := models.DeleteEventPipelines(rt.Ctx, f.Ids)
-	ginx.NewRender(c).Message(err)
-}
-
-// 测试事件Pipeline
-func (rt *Router) tryRunEventPipeline(c *gin.Context) {
-	var f struct {
-		EventId        int64                `json:"event_id"`
-		PipelineConfig models.EventPipeline `json:"pipeline_config"`
-	}
-	ginx.BindJSON(c, &f)
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	if err != nil || hisEvent == nil {
-		ginx.Bomb(http.StatusBadRequest, "event not found")
-	}
-	event := hisEvent.ToCur()
-
-	for _, p := range f.PipelineConfig.ProcessorConfigs {
-		processor, err := models.GetProcessorByType(p.Typ, p.Config)
-		if err != nil {
-			ginx.Bomb(http.StatusBadRequest, "get processor: %+v err: %+v", p, err)
-		}
-		event, _, err = processor.Process(rt.Ctx, event)
-		if err != nil {
-			ginx.Bomb(http.StatusBadRequest, "processor: %+v err: %+v", p, err)
-		}
-
-		if event == nil {
-			ginx.NewRender(c).Data(map[string]interface{}{
-				"event":  event,
-				"result": "event is dropped",
-			}, nil)
-			return
-		}
-	}
-
-	ginx.NewRender(c).Data(event, nil)
-}
-
-// 测试事件处理器
-func (rt *Router) tryRunEventProcessor(c *gin.Context) {
-	var f struct {
-		EventId         int64                  `json:"event_id"`
-		ProcessorConfig models.ProcessorConfig `json:"processor_config"`
-	}
-	ginx.BindJSON(c, &f)
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	if err != nil || hisEvent == nil {
-		ginx.Bomb(http.StatusBadRequest, "event not found")
-	}
-	event := hisEvent.ToCur()
-
-	processor, err := models.GetProcessorByType(f.ProcessorConfig.Typ, f.ProcessorConfig.Config)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "get processor err: %+v", err)
-	}
-	event, res, err := processor.Process(rt.Ctx, event)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "processor err: %+v", err)
-	}
-
-	ginx.NewRender(c).Data(map[string]interface{}{
-		"event":  event,
-		"result": res,
-	}, nil)
-}
-
-func (rt *Router) tryRunEventProcessorByNotifyRule(c *gin.Context) {
-	var f struct {
-		EventId         int64                   `json:"event_id"`
-		PipelineConfigs []models.PipelineConfig `json:"pipeline_configs"`
-	}
-	ginx.BindJSON(c, &f)
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	if err != nil || hisEvent == nil {
-		ginx.Bomb(http.StatusBadRequest, "event not found")
-	}
-	event := hisEvent.ToCur()
-
-	pids := make([]int64, 0)
-	for _, pc := range f.PipelineConfigs {
-		if pc.Enable {
-			pids = append(pids, pc.PipelineId)
-		}
-	}
-
-	pipelines, err := models.GetEventPipelinesByIds(rt.Ctx, pids)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "processors not found")
-	}
-
-	for _, pl := range pipelines {
-		for _, p := range pl.ProcessorConfigs {
-			processor, err := models.GetProcessorByType(p.Typ, p.Config)
-			if err != nil {
-				ginx.Bomb(http.StatusBadRequest, "get processor: %+v err: %+v", p, err)
-			}
-
-			event, _, err := processor.Process(rt.Ctx, event)
-			if err != nil {
-				ginx.Bomb(http.StatusBadRequest, "processor: %+v err: %+v", p, err)
-			}
-			if event == nil {
-				ginx.NewRender(c).Data(map[string]interface{}{
-					"event":  event,
-					"result": "event is dropped",
-				}, nil)
-				return
-			}
-		}
-	}
-
-	ginx.NewRender(c).Data(event, nil)
-}
-
-func (rt *Router) eventPipelinesListByService(c *gin.Context) {
-	pipelines, err := models.ListEventPipelines(rt.Ctx)
-	ginx.NewRender(c).Data(pipelines, err)
-}

center/router/router_funcs.go

@@ -36,14 +36,6 @@ func (rt *Router) statistic(c *gin.Context) {
 		model = models.User{}
 	case "user_group":
 		model = models.UserGroup{}
-	case "notify_rule":
-		model = models.NotifyRule{}
-	case "notify_channel":
-		model = models.NotifyChannel{}
-	case "event_pipeline":
-		statistics, err = models.EventPipelineStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
 	case "datasource":
 		// datasource update_at is different from others
 		statistics, err = models.DatasourceStatistics(rt.Ctx)
@@ -57,10 +49,6 @@ func (rt *Router) statistic(c *gin.Context) {
 		statistics, err = models.ConfigCvalStatistics(rt.Ctx)
 		ginx.NewRender(c).Data(statistics, err)
 		return
-	case "message_template":
-		statistics, err = models.MessageTemplateStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
 	default:
 		ginx.Bomb(http.StatusBadRequest, "invalid name")
 	}
@@ -173,38 +161,3 @@ func Username(c *gin.Context) string {
 	}
 	return username
 }
-
-func HasPermission(ctx *ctx.Context, c *gin.Context, sourceType, sourceId string, isAnonymousAccess bool) bool {
-	if sourceType == "event" && isAnonymousAccess {
-		return true
-	}
-
-	// 尝试从请求中获取 __token 参数
-	token := ginx.QueryStr(c, "__token", "")
-
-	// 如果有 __token 参数，验证其合法性
-	if token != "" {
-		return ValidateSourceToken(ctx, sourceType, sourceId, token)
-	}
-
-	return false
-}
-
-func ValidateSourceToken(ctx *ctx.Context, sourceType, sourceId, token string) bool {
-	if token == "" {
-		return false
-	}
-
-	// 根据源类型、源ID和令牌获取源令牌记录
-	sourceToken, err := models.GetSourceTokenBySource(ctx, sourceType, sourceId, token)
-	if err != nil {
-		return false
-	}
-
-	// 检查令牌是否过期
-	if sourceToken.IsExpired() {
-		return false
-	}
-
-	return true
-}

center/router/router_login.go

@@ -152,13 +152,6 @@ func (rt *Router) refreshPost(c *gin.Context) {
 			return
 		}
 
-		// 看这个 token 是否还存在 redis 中
-		val, err := rt.fetchAuth(c.Request.Context(), refreshUuid)
-		if err != nil || val == "" {
-			ginx.NewRender(c, http.StatusUnauthorized).Message("refresh token expired")
-			return
-		}
-
 		userIdentity, ok := claims["user_identity"].(string)
 		if !ok {
 			// Theoretically impossible

center/router/router_message_template.go

@@ -1,219 +0,0 @@
-package router
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/slice"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func (rt *Router) messageTemplatesAdd(c *gin.Context) {
-	var lst []*models.MessageTemplate
-	ginx.BindJSON(c, &lst)
-	if len(lst) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input json is empty")
-	}
-
-	me := c.MustGet("user").(*models.User)
-	isAdmin := me.IsAdmin()
-	idents := make([]string, 0, len(lst))
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-	now := time.Now().Unix()
-	for _, tpl := range lst {
-		// 生成一个唯一的标识符，以后也不允许修改，前端不需要传这个参数
-		tpl.Ident = uuid.New().String()
-
-		ginx.Dangerous(tpl.Verify())
-		if !isAdmin && !slice.HaveIntersection(gids, tpl.UserGroupIds) {
-			ginx.Bomb(http.StatusForbidden, "forbidden")
-		}
-		idents = append(idents, tpl.Ident)
-
-		tpl.CreateBy = me.Username
-		tpl.CreateAt = now
-		tpl.UpdateBy = me.Username
-		tpl.UpdateAt = now
-	}
-
-	lstWithSameId, err := models.MessageTemplatesGet(rt.Ctx, "ident IN ?", idents)
-	ginx.Dangerous(err)
-	if len(lstWithSameId) > 0 {
-		ginx.Bomb(http.StatusBadRequest, "ident already exists")
-	}
-
-	ids := make([]int64, 0, len(lst))
-	for _, tpl := range lst {
-		err := models.Insert(rt.Ctx, tpl)
-		ginx.Dangerous(err)
-
-		ids = append(ids, tpl.ID)
-	}
-	ginx.NewRender(c).Data(ids, nil)
-}
-
-func (rt *Router) messageTemplatesDel(c *gin.Context) {
-	var f idsForm
-	ginx.BindJSON(c, &f)
-	f.Verify()
-
-	lst, err := models.MessageTemplatesGet(rt.Ctx, "id in (?)", f.Ids)
-	ginx.Dangerous(err)
-	notifyRuleIds, err := models.UsedByNotifyRule(rt.Ctx, models.MsgTplList(lst))
-	ginx.Dangerous(err)
-	if len(notifyRuleIds) > 0 {
-		ginx.NewRender(c).Message(fmt.Errorf("used by notify rule: %v", notifyRuleIds))
-		return
-	}
-	if me := c.MustGet("user").(*models.User); !me.IsAdmin() {
-		gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-		ginx.Dangerous(err)
-		for _, t := range lst {
-			if !slice.HaveIntersection(gids, t.UserGroupIds) {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
-			}
-		}
-	}
-
-	ginx.NewRender(c).Message(models.DB(rt.Ctx).Delete(
-		&models.MessageTemplate{}, "id in (?)", f.Ids).Error)
-}
-
-func (rt *Router) messageTemplatePut(c *gin.Context) {
-	var f models.MessageTemplate
-	ginx.BindJSON(c, &f)
-
-	mt, err := models.MessageTemplateGet(rt.Ctx, "id <> ? and ident = ?", ginx.UrlParamInt64(c, "id"), f.Ident)
-	ginx.Dangerous(err)
-	if mt != nil {
-		ginx.Bomb(http.StatusBadRequest, "message template ident already exists")
-	}
-
-	mt, err = models.MessageTemplateGet(rt.Ctx, "id = ?", ginx.UrlParamInt64(c, "id"))
-	ginx.Dangerous(err)
-	if mt == nil {
-		ginx.Bomb(http.StatusNotFound, "message template not found")
-	}
-
-	me := c.MustGet("user").(*models.User)
-	if !me.IsAdmin() {
-		gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-		ginx.Dangerous(err)
-		if !slice.HaveIntersection(gids, mt.UserGroupIds) {
-			ginx.Bomb(http.StatusForbidden, "forbidden")
-		}
-	}
-
-	f.UpdateBy = me.Username
-	ginx.NewRender(c).Message(mt.Update(rt.Ctx, f))
-}
-
-func (rt *Router) messageTemplateGet(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	tid := ginx.UrlParamInt64(c, "id")
-	mt, err := models.MessageTemplateGet(rt.Ctx, "id = ?", tid)
-	ginx.Dangerous(err)
-	if mt == nil {
-		ginx.Bomb(http.StatusNotFound, "message template not found")
-	}
-	if mt.Private == 1 && !slice.HaveIntersection(gids, mt.UserGroupIds) {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
-	}
-
-	ginx.NewRender(c).Data(mt, nil)
-}
-
-func (rt *Router) messageTemplatesGet(c *gin.Context) {
-	var notifyChannelIdents []string
-	if tmp := ginx.QueryStr(c, "notify_channel_idents", ""); tmp != "" {
-		notifyChannelIdents = strings.Split(tmp, ",")
-	}
-	notifyChannelIds := strx.IdsInt64ForAPI(ginx.QueryStr(c, "notify_channel_ids", ""))
-	if len(notifyChannelIds) > 0 {
-		ginx.Dangerous(models.DB(rt.Ctx).Model(models.NotifyChannelConfig{}).
-			Where("id in (?)", notifyChannelIds).Pluck("ident", &notifyChannelIdents).Error)
-	}
-
-	me := c.MustGet("user").(*models.User)
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	lst, err := models.MessageTemplatesGetBy(rt.Ctx, notifyChannelIdents)
-	ginx.Dangerous(err)
-
-	if me.IsAdmin() {
-		ginx.NewRender(c).Data(lst, nil)
-		return
-	}
-
-	res := make([]*models.MessageTemplate, 0)
-	for _, t := range lst {
-		if slice.HaveIntersection[int64](gids, t.UserGroupIds) || t.Private == 0 {
-			res = append(res, t)
-		}
-	}
-	ginx.NewRender(c).Data(res, nil)
-}
-
-type evtMsgReq struct {
-	EventIds []int64 `json:"event_ids"`
-	Tpl      struct {
-		Content map[string]string `json:"content"`
-	} `json:"tpl"`
-}
-
-func (rt *Router) eventsMessage(c *gin.Context) {
-	var req evtMsgReq
-	ginx.BindJSON(c, &req)
-
-	hisEvents, err := models.AlertHisEventGetByIds(rt.Ctx, req.EventIds)
-	ginx.Dangerous(err)
-
-	if len(hisEvents) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "event not found")
-	}
-
-	ginx.Dangerous(err)
-	events := make([]*models.AlertCurEvent, len(hisEvents))
-	for i, he := range hisEvents {
-		events[i] = he.ToCur()
-	}
-
-	var defs = []string{
-		"{{$events := .}}",
-		"{{$event := index . 0}}",
-	}
-	ret := make(map[string]string, len(req.Tpl.Content))
-	for k, v := range req.Tpl.Content {
-		text := strings.Join(append(defs, v), "")
-		tpl, err := template.New(k).Funcs(tplx.TemplateFuncMap).Parse(text)
-		if err != nil {
-			ret[k] = err.Error()
-			continue
-		}
-
-		var buf bytes.Buffer
-		err = tpl.Execute(&buf, events)
-		if err != nil {
-			ret[k] = err.Error()
-			continue
-		}
-
-		ret[k] = buf.String()
-	}
-	ginx.NewRender(c).Data(ret, nil)
-}

center/router/router_mute.go

@@ -1,18 +1,16 @@
 package router
 
 import (
-	"math"
 	"net/http"
 	"strings"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/common"
-	"github.com/ccfos/nightingale/v6/alert/mute"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/str"
 )
 
 // Return all, front-end search and paging
@@ -24,7 +22,7 @@ func (rt *Router) alertMuteGetsByBG(c *gin.Context) {
 }
 
 func (rt *Router) alertMuteGetsByGids(c *gin.Context) {
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
 		for _, gid := range gids {
 			rt.bgroCheck(c, gid)
@@ -65,45 +63,10 @@ func (rt *Router) alertMuteAdd(c *gin.Context) {
 
 	username := c.MustGet("username").(string)
 	f.CreateBy = username
-	f.UpdateBy = username
 	f.GroupId = ginx.UrlParamInt64(c, "id")
 	ginx.NewRender(c).Message(f.Add(rt.Ctx))
 }
 
-type MuteTestForm struct {
-	EventId   int64            `json:"event_id" binding:"required"`
-	AlertMute models.AlertMute `json:"mute_config" binding:"required"`
-}
-
-func (rt *Router) alertMuteTryRun(c *gin.Context) {
-
-	var f MuteTestForm
-	ginx.BindJSON(c, &f)
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	ginx.Dangerous(err)
-
-	if hisEvent == nil {
-		ginx.Bomb(http.StatusNotFound, "event not found")
-	}
-
-	curEvent := *hisEvent.ToCur()
-	curEvent.SetTagsMap()
-
-	// 绕过时间范围检查：设置时间范围为全量（0 到 int64 最大值），仅验证其他匹配条件（如标签、策略类型等）
-	f.AlertMute.MuteTimeType = models.TimeRange
-	f.AlertMute.Btime = 0             // 最小可能值（如 Unix 时间戳起点）
-	f.AlertMute.Etime = math.MaxInt64 // 最大可能值（int64 上限）
-
-	if !mute.MatchMute(&curEvent, &f.AlertMute) {
-		ginx.NewRender(c).Data("not match", nil)
-		return
-	}
-
-	ginx.NewRender(c).Data("mute test match", nil)
-
-}
-
 // Preview events (alert_cur_event) that match the mute strategy based on the following criteria:
 // business group ID (group_id, group_id), product (prod, rule_prod),
 // alert event severity (severities, severity), and event tags (tags, tags).

center/router/router_mw.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ccfos/nightingale/v6/center/cstats"
 	"github.com/ccfos/nightingale/v6/models"
 
 	"github.com/gin-gonic/gin"
@@ -18,10 +17,6 @@ import (
 	"github.com/toolkits/pkg/ginx"
 )
 
-const (
-	DefaultTokenKey = "X-User-Token"
-)
-
 type AccessDetails struct {
 	AccessUuid   string
 	UserIdentity string
@@ -67,29 +62,8 @@ func (rt *Router) proxyAuth() gin.HandlerFunc {
 	}
 }
 
-// tokenAuth 支持两种方式的认证，固定 token 和 jwt token
-// 因为不太好区分用户使用哪个方式，所以两种方式放在一个中间件里
-func (rt *Router) tokenAuth() gin.HandlerFunc {
+func (rt *Router) jwtAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		// 先验证固定 token
-		if rt.HTTP.TokenAuth.Enable {
-			tokenKey := rt.HTTP.TokenAuth.HeaderUserTokenKey
-			if tokenKey == "" {
-				tokenKey = DefaultTokenKey
-			}
-			token := c.GetHeader(tokenKey)
-			if token != "" {
-				user := rt.UserTokenCache.GetByToken(token)
-				if user != nil && user.Username != "" {
-					c.Set("userid", user.Id)
-					c.Set("username", user.Username)
-					c.Next()
-					return
-				}
-			}
-		}
-
-		// 再验证 jwt token
 		metadata, err := rt.extractTokenMetadata(c.Request)
 		if err != nil {
 			ginx.Bomb(http.StatusUnauthorized, "unauthorized")
@@ -126,7 +100,7 @@ func (rt *Router) auth() gin.HandlerFunc {
 	if rt.HTTP.ProxyAuth.Enable {
 		return rt.proxyAuth()
 	} else {
-		return rt.tokenAuth()
+		return rt.jwtAuth()
 	}
 }
 
@@ -156,9 +130,9 @@ func (rt *Router) User() gin.HandlerFunc {
 
 func (rt *Router) user() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		username := c.MustGet("username").(string)
+		userid := c.MustGet("userid").(int64)
 
-		user, err := models.UserGetByUsername(rt.Ctx, username)
+		user, err := models.UserGetById(rt.Ctx, userid)
 		if err != nil {
 			ginx.Bomb(http.StatusUnauthorized, "unauthorized")
 		}
@@ -336,12 +310,6 @@ func (rt *Router) extractTokenMetadata(r *http.Request) (*AccessDetails, error)
 			return nil, errors.New("failed to parse access_uuid from jwt")
 		}
 
-		// accessUuid 在 redis 里存在才放行
-		val, err := rt.fetchAuth(r.Context(), accessUuid)
-		if err != nil || val == "" {
-			return nil, errors.New("unauthorized")
-		}
-
 		return &AccessDetails{
 			AccessUuid:   accessUuid,
 			UserIdentity: claims["user_identity"].(string),
@@ -362,72 +330,29 @@ func (rt *Router) extractToken(r *http.Request) string {
 }
 
 func (rt *Router) createAuth(ctx context.Context, userIdentity string, td *TokenDetails) error {
-	username := strings.Split(userIdentity, "-")[1]
-
-	// 如果只能有一个账号登录，那么就删除之前的 token
-	if rt.HTTP.JWTAuth.SingleLogin {
-		delKeys, err := rt.Redis.SMembers(ctx, rt.wrapJwtKey(username)).Result()
-		if err != nil {
-			return err
-		}
-
-		if len(delKeys) > 0 {
-			errDel := rt.Redis.Del(ctx, delKeys...).Err()
-			if errDel != nil {
-				return errDel
-			}
-		}
-
-		if errDel := rt.Redis.Del(ctx, rt.wrapJwtKey(username)).Err(); errDel != nil {
-			return errDel
-		}
-	}
-
 	at := time.Unix(td.AtExpires, 0)
 	rte := time.Unix(td.RtExpires, 0)
 	now := time.Now()
 
-	if err := rt.Redis.Set(ctx, rt.wrapJwtKey(td.AccessUuid), userIdentity, at.Sub(now)).Err(); err != nil {
-		cstats.RedisOperationLatency.WithLabelValues("set_token", "fail").Observe(time.Since(now).Seconds())
-		return err
+	errAccess := rt.Redis.Set(ctx, rt.wrapJwtKey(td.AccessUuid), userIdentity, at.Sub(now)).Err()
+	if errAccess != nil {
+		return errAccess
 	}
 
-	if err := rt.Redis.Set(ctx, rt.wrapJwtKey(td.RefreshUuid), userIdentity, rte.Sub(now)).Err(); err != nil {
-		cstats.RedisOperationLatency.WithLabelValues("set_token", "fail").Observe(time.Since(now).Seconds())
-		return err
-	}
-
-	cstats.RedisOperationLatency.WithLabelValues("set_token", "success").Observe(time.Since(now).Seconds())
-
-	if rt.HTTP.JWTAuth.SingleLogin {
-		if err := rt.Redis.SAdd(ctx, rt.wrapJwtKey(username), rt.wrapJwtKey(td.AccessUuid), rt.wrapJwtKey(td.RefreshUuid)).Err(); err != nil {
-			return err
-		}
+	errRefresh := rt.Redis.Set(ctx, rt.wrapJwtKey(td.RefreshUuid), userIdentity, rte.Sub(now)).Err()
+	if errRefresh != nil {
+		return errRefresh
 	}
 
 	return nil
 }
 
 func (rt *Router) fetchAuth(ctx context.Context, givenUuid string) (string, error) {
-	now := time.Now()
-	ret, err := rt.Redis.Get(ctx, rt.wrapJwtKey(givenUuid)).Result()
-	if err != nil {
-		cstats.RedisOperationLatency.WithLabelValues("get_token", "fail").Observe(time.Since(now).Seconds())
-	} else {
-		cstats.RedisOperationLatency.WithLabelValues("get_token", "success").Observe(time.Since(now).Seconds())
-	}
-
-	return ret, err
+	return rt.Redis.Get(ctx, rt.wrapJwtKey(givenUuid)).Result()
 }
 
 func (rt *Router) deleteAuth(ctx context.Context, givenUuid string) error {
-	err := rt.Redis.Del(ctx, rt.wrapJwtKey(givenUuid)).Err()
-	if err != nil {
-		cstats.RedisOperationLatency.WithLabelValues("del_token", "fail").Observe(time.Since(time.Now()).Seconds())
-	} else {
-		cstats.RedisOperationLatency.WithLabelValues("del_token", "success").Observe(time.Since(time.Now()).Seconds())
-	}
-	return err
+	return rt.Redis.Del(ctx, rt.wrapJwtKey(givenUuid)).Err()
 }
 
 func (rt *Router) deleteTokens(ctx context.Context, authD *AccessDetails) error {

center/router/router_notification_record.go

@@ -3,7 +3,6 @@ package router
 import (
 	"strings"
 
-	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 
@@ -18,27 +17,36 @@ type NotificationResponse struct {
 }
 
 type SubRule struct {
-	SubID        int64               `json:"sub_id"`
-	NotifyRuleId int64               `json:"notify_rule_id"`
-	Notifies     map[string][]Record `json:"notifies"`
+	SubID    int64               `json:"sub_id"`
+	Notifies map[string][]Record `json:"notifies"`
+}
+
+type Notify struct {
+	Channel string   `json:"channel"`
+	Records []Record `json:"records"`
 }
 
 type Record struct {
-	NotifyRuleId int64  `json:"notify_rule_id"`
-	Target       string `json:"target"`
-	Username     string `json:"username"`
-	Status       int    `json:"status"`
-	Detail       string `json:"detail"`
+	Target   string `json:"target"`
+	Username string `json:"username"`
+	Status   int    `json:"status"`
+	Detail   string `json:"detail"`
 }
 
 // notificationRecordAdd
 func (rt *Router) notificationRecordAdd(c *gin.Context) {
 	var req []*models.NotificaitonRecord
 	ginx.BindJSON(c, &req)
-	err := sender.PushNotifyRecords(req)
-	ginx.Dangerous(err, 429)
+	err := models.DB(rt.Ctx).CreateInBatches(req, 100).Error
+	var ids []int64
+	if err == nil {
+		ids = make([]int64, len(req))
+		for i, noti := range req {
+			ids[i] = noti.Id
+		}
+	}
 
-	ginx.NewRender(c).Data(nil, err)
+	ginx.NewRender(c).Data(ids, err)
 }
 
 func (rt *Router) notificationRecordList(c *gin.Context) {
@@ -110,10 +118,9 @@ func buildNotificationResponse(ctx *ctx.Context, nl []*models.NotificaitonRecord
 			n.Target = replaceLastEightChars(n.Target)
 		}
 		record := Record{
-			Target:       n.Target,
-			Status:       n.Status,
-			Detail:       n.Details,
-			NotifyRuleId: n.NotifyRuleID,
+			Target: n.Target,
+			Status: n.Status,
+			Detail: n.Details,
 		}
 
 		record.Username = strings.Join(usernames, ",")
@@ -123,8 +130,7 @@ func buildNotificationResponse(ctx *ctx.Context, nl []*models.NotificaitonRecord
 			subRule, ok := subRuleMap[n.SubId]
 			if !ok {
 				newSubRule := &SubRule{
-					NotifyRuleId: n.NotifyRuleID,
-					SubID:        n.SubId,
+					SubID: n.SubId,
 				}
 				newSubRule.Notifies = make(map[string][]Record)
 				newSubRule.Notifies[n.Channel] = []Record{record}

center/router/router_notify_channel.go

@@ -1,268 +0,0 @@
-package router
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"sort"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func (rt *Router) notifyChannelsAdd(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-
-	var lst []*models.NotifyChannelConfig
-	ginx.BindJSON(c, &lst)
-	if len(lst) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input json is empty")
-	}
-
-	names := make([]string, 0, len(lst))
-	for i := range lst {
-		ginx.Dangerous(lst[i].Verify())
-		names = append(names, lst[i].Name)
-
-		lst[i].CreateBy = me.Username
-		lst[i].CreateAt = time.Now().Unix()
-		lst[i].UpdateBy = me.Username
-		lst[i].UpdateAt = time.Now().Unix()
-	}
-
-	lstWithSameName, err := models.NotifyChannelsGet(rt.Ctx, "name IN ?", names)
-	ginx.Dangerous(err)
-	if len(lstWithSameName) > 0 {
-		ginx.Bomb(http.StatusBadRequest, "name already exists")
-	}
-
-	ids := make([]int64, 0, len(lst))
-	for _, item := range lst {
-		err := models.Insert(rt.Ctx, item)
-		ginx.Dangerous(err)
-
-		ids = append(ids, item.ID)
-	}
-	ginx.NewRender(c).Data(ids, nil)
-}
-
-func (rt *Router) notifyChannelsDel(c *gin.Context) {
-	var f idsForm
-	ginx.BindJSON(c, &f)
-	f.Verify()
-
-	lst, err := models.NotifyChannelsGet(rt.Ctx, "id in (?)", f.Ids)
-	ginx.Dangerous(err)
-	notifyRuleIds, err := models.UsedByNotifyRule(rt.Ctx, models.NotiChList(lst))
-	ginx.Dangerous(err)
-	if len(notifyRuleIds) > 0 {
-		ginx.NewRender(c).Message(fmt.Errorf("used by notify rule: %v", notifyRuleIds))
-		return
-	}
-
-	ginx.NewRender(c).Message(models.DB(rt.Ctx).
-		Delete(&models.NotifyChannelConfig{}, "id in (?)", f.Ids).Error)
-}
-
-func (rt *Router) notifyChannelPut(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-
-	var f models.NotifyChannelConfig
-	ginx.BindJSON(c, &f)
-
-	lstWithSameName, err := models.NotifyChannelsGet(rt.Ctx, "name = ? and id <> ?", f.Name, f.ID)
-	ginx.Dangerous(err)
-	if len(lstWithSameName) > 0 {
-		ginx.Bomb(http.StatusBadRequest, "name already exists")
-	}
-
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", ginx.UrlParamInt64(c, "id"))
-	ginx.Dangerous(err)
-	if nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	f.UpdateBy = me.Username
-	ginx.NewRender(c).Message(nc.Update(rt.Ctx, f))
-}
-
-func (rt *Router) notifyChannelGet(c *gin.Context) {
-	cid := ginx.UrlParamInt64(c, "id")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
-	ginx.Dangerous(err)
-	if nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	ginx.NewRender(c).Data(nc, nil)
-}
-
-func (rt *Router) notifyChannelGetBy(c *gin.Context) {
-	ident := ginx.QueryStr(c, "ident")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "ident = ?", ident)
-	ginx.Dangerous(err)
-	if nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	nc.ParamConfig = &models.NotifyParamConfig{}
-	nc.RequestConfig = &models.RequestConfig{}
-
-	ginx.NewRender(c).Data(nc, nil)
-}
-
-func (rt *Router) notifyChannelsGet(c *gin.Context) {
-	lst, err := models.NotifyChannelsGet(rt.Ctx, "", nil)
-	ginx.NewRender(c).Data(lst, err)
-}
-
-func (rt *Router) notifyChannelsGetForNormalUser(c *gin.Context) {
-	lst, err := models.NotifyChannelsGet(rt.Ctx, "")
-	ginx.Dangerous(err)
-
-	newLst := make([]*models.NotifyChannelConfig, 0, len(lst))
-	for _, c := range lst {
-		newLst = append(newLst, &models.NotifyChannelConfig{
-			ID:          c.ID,
-			Name:        c.Name,
-			Ident:       c.Ident,
-			Enable:      c.Enable,
-			RequestType: c.RequestType,
-			ParamConfig: c.ParamConfig,
-		})
-	}
-	ginx.NewRender(c).Data(newLst, nil)
-}
-
-func (rt *Router) notifyChannelIdentsGet(c *gin.Context) {
-	// 获取所有通知渠道
-	channels, err := models.NotifyChannelsGet(rt.Ctx, "", nil)
-	ginx.Dangerous(err)
-
-	// ident 去重
-	idents := make(map[string]struct{})
-	for _, channel := range channels {
-		if channel.Ident != "" {
-			idents[channel.Ident] = struct{}{}
-		}
-	}
-
-	lst := make([]string, 0, len(idents))
-	for ident := range idents {
-		lst = append(lst, ident)
-	}
-
-	sort.Strings(lst)
-
-	ginx.NewRender(c).Data(lst, nil)
-}
-
-type flushDutyChannelsResponse struct {
-	Error struct {
-		Code    string `json:"code"`
-		Message string `json:"message"`
-	} `json:"error"`
-	Data struct {
-		Items []struct {
-			ChannelID   int    `json:"channel_id"`
-			ChannelName string `json:"channel_name"`
-			Status      string `json:"status"`
-		} `json:"items"`
-		Total int `json:"total"`
-	} `json:"data"`
-}
-
-func (rt *Router) flashDutyNotifyChannelsGet(c *gin.Context) {
-	cid := ginx.UrlParamInt64(c, "id")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
-	ginx.Dangerous(err)
-	if nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	configs, err := models.ConfigsSelectByCkey(rt.Ctx, "flashduty_app_key")
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "failed to get flashduty app key")
-	}
-
-	jsonData := []byte("{}")
-	if len(configs) > 0 {
-		me := c.MustGet("user").(*models.User)
-		jsonData = []byte(fmt.Sprintf(`{"member_name":"%s","email":"%s","phone":"%s"}`, me.Username, me.Email, me.Phone))
-	}
-
-	items, err := getFlashDutyChannels(nc.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, jsonData)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(items, nil)
-}
-
-// getFlashDutyChannels 从FlashDuty API获取频道列表
-func getFlashDutyChannels(integrationUrl string, jsonData []byte) ([]struct {
-	ChannelID   int    `json:"channel_id"`
-	ChannelName string `json:"channel_name"`
-	Status      string `json:"status"`
-}, error) {
-	// 解析URL，提取baseUrl和参数
-	baseUrl, integrationKey, err := parseIntegrationUrl(integrationUrl)
-	if err != nil {
-		return nil, err
-	}
-
-	if integrationKey == "" {
-		return nil, fmt.Errorf("integration_key not found in URL")
-	}
-
-	// 构建新的API URL，保持原始路径
-	url := fmt.Sprintf("%s/channel/list-by-integration?integration_key=%s", baseUrl, integrationKey)
-
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
-	if err != nil {
-		return nil, err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	httpResp, err := (&http.Client{}).Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer httpResp.Body.Close()
-
-	body, err := io.ReadAll(httpResp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var res flushDutyChannelsResponse
-	if err := json.Unmarshal(body, &res); err != nil {
-		return nil, err
-	}
-
-	if res.Error.Message != "" {
-		return nil, fmt.Errorf(res.Error.Message)
-	}
-
-	return res.Data.Items, nil
-}
-
-// parseIntegrationUrl 从URL中提取baseUrl和参数
-func parseIntegrationUrl(urlStr string) (baseUrl string, integrationKey string, err error) {
-	// 解析URL
-	parsedUrl, err := url.Parse(urlStr)
-	if err != nil {
-		return "", "", err
-	}
-
-	host := fmt.Sprintf("%s://%s", parsedUrl.Scheme, parsedUrl.Host)
-
-	// 提取查询参数
-	queryParams := parsedUrl.Query()
-	integrationKey = queryParams.Get("integration_key")
-
-	return host, integrationKey, nil
-}

center/router/router_notify_channel_test.go

@@ -1,17 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestGetFlashDutyChannels(t *testing.T) {
-	// 构造测试数据
-	integrationUrl := "https://api.flashcat.cloud/event/push/alert/n9e?integration_key=xxx"
-	jsonData := []byte(`{}`)
-
-	// 调用被测试的函数
-	channels, err := getFlashDutyChannels(integrationUrl, jsonData)
-
-	fmt.Println(channels, err)
-}

center/router/router_notify_config.go

@@ -111,7 +111,7 @@ func (rt *Router) notifyChannelPuts(c *gin.Context) {
 }
 
 func (rt *Router) notifyContactGets(c *gin.Context) {
-	notifyContacts := []models.NotifyContact{}
+	var notifyContacts []models.NotifyContact
 	cval, err := models.ConfigsGet(rt.Ctx, models.NOTIFYCONTACT)
 	ginx.Dangerous(err)
 	if cval == "" {
@@ -120,7 +120,6 @@ func (rt *Router) notifyContactGets(c *gin.Context) {
 	}
 
 	err = json.Unmarshal([]byte(cval), &notifyContacts)
-
 	ginx.NewRender(c).Data(notifyContacts, err)
 }
 
@@ -128,6 +127,20 @@ func (rt *Router) notifyContactPuts(c *gin.Context) {
 	var notifyContacts []models.NotifyContact
 	ginx.BindJSON(c, &notifyContacts)
 
+	keys := []string{models.DingtalkKey, models.WecomKey, models.FeishuKey, models.MmKey,
+		models.TelegramKey, models.LarkKey}
+
+	m := make(map[string]struct{})
+	for _, v := range notifyContacts {
+		m[v.Ident] = struct{}{}
+	}
+
+	for _, v := range keys {
+		if _, ok := m[v]; !ok {
+			ginx.Bomb(200, "contact %s ident can not modify", v)
+		}
+	}
+
 	data, err := json.Marshal(notifyContacts)
 	ginx.Dangerous(err)
 	username := c.MustGet("username").(string)
@@ -213,14 +226,3 @@ func (rt *Router) attemptSendEmail(c *gin.Context) {
 	ginx.NewRender(c).Message(sender.SendEmail("Email test", "email content", []string{f.Email}, smtp))
 
 }
-
-func (rt *Router) notifyChannelConfigGets(c *gin.Context) {
-
-	id := ginx.QueryInt64(c, "id", 0)
-	name := ginx.QueryStr(c, "name", "")
-	ident := ginx.QueryStr(c, "ident", "")
-	eabled := ginx.QueryInt(c, "eabled", -1)
-
-	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, id, name, ident, eabled)
-	ginx.NewRender(c).Data(notifyChannels, err)
-}

center/router/router_notify_rule.go

@@ -1,324 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/dispatch"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/slice"
-
-	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-func (rt *Router) notifyRulesAdd(c *gin.Context) {
-	var lst []*models.NotifyRule
-	ginx.BindJSON(c, &lst)
-	if len(lst) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input json is empty")
-	}
-
-	me := c.MustGet("user").(*models.User)
-	isAdmin := me.IsAdmin()
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	now := time.Now().Unix()
-	for _, nr := range lst {
-		ginx.Dangerous(nr.Verify())
-		if !isAdmin && !slice.HaveIntersection(gids, nr.UserGroupIds) {
-			ginx.Bomb(http.StatusForbidden, "forbidden")
-		}
-
-		nr.CreateBy = me.Username
-		nr.CreateAt = now
-		nr.UpdateBy = me.Username
-		nr.UpdateAt = now
-
-		err := models.Insert(rt.Ctx, nr)
-		ginx.Dangerous(err)
-	}
-	ginx.NewRender(c).Data(lst, nil)
-}
-
-func (rt *Router) notifyRulesDel(c *gin.Context) {
-	var f idsForm
-	ginx.BindJSON(c, &f)
-	f.Verify()
-
-	if me := c.MustGet("user").(*models.User); !me.IsAdmin() {
-		lst, err := models.NotifyRulesGet(rt.Ctx, "id in (?)", f.Ids)
-		ginx.Dangerous(err)
-		gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-		ginx.Dangerous(err)
-		for _, t := range lst {
-			if !slice.HaveIntersection(gids, t.UserGroupIds) {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
-			}
-		}
-	}
-
-	ginx.NewRender(c).Message(models.DB(rt.Ctx).
-		Delete(&models.NotifyRule{}, "id in (?)", f.Ids).Error)
-}
-
-func (rt *Router) notifyRulePut(c *gin.Context) {
-	var f models.NotifyRule
-	ginx.BindJSON(c, &f)
-
-	nr, err := models.NotifyRuleGet(rt.Ctx, "id = ?", ginx.UrlParamInt64(c, "id"))
-	ginx.Dangerous(err)
-	if nr == nil {
-		ginx.Bomb(http.StatusNotFound, "notify rule not found")
-	}
-
-	me := c.MustGet("user").(*models.User)
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-	if !slice.HaveIntersection(gids, nr.UserGroupIds) && !me.IsAdmin() {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
-	}
-
-	f.UpdateBy = me.Username
-	ginx.NewRender(c).Message(nr.Update(rt.Ctx, f))
-}
-
-func (rt *Router) notifyRuleGet(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	tid := ginx.UrlParamInt64(c, "id")
-	nr, err := models.NotifyRuleGet(rt.Ctx, "id = ?", tid)
-	ginx.Dangerous(err)
-	if nr == nil {
-		ginx.Bomb(http.StatusNotFound, "notify rule not found")
-	}
-
-	if !slice.HaveIntersection(gids, nr.UserGroupIds) && !me.IsAdmin() {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
-	}
-
-	ginx.NewRender(c).Data(nr, nil)
-}
-
-func (rt *Router) notifyRulesGetByService(c *gin.Context) {
-	ginx.NewRender(c).Data(models.NotifyRulesGet(rt.Ctx, "enable = ?", true))
-}
-
-func (rt *Router) notifyRulesGet(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	lst, err := models.NotifyRulesGet(rt.Ctx, "", nil)
-	ginx.Dangerous(err)
-	if me.IsAdmin() {
-		ginx.NewRender(c).Data(lst, nil)
-		return
-	}
-
-	res := make([]*models.NotifyRule, 0)
-	for _, nr := range lst {
-		if slice.HaveIntersection[int64](gids, nr.UserGroupIds) {
-			res = append(res, nr)
-		}
-	}
-	ginx.NewRender(c).Data(res, nil)
-}
-
-type NotifyTestForm struct {
-	EventIDs     []int64             `json:"event_ids" binding:"required"`
-	NotifyConfig models.NotifyConfig `json:"notify_config" binding:"required"`
-}
-
-func (rt *Router) notifyTest(c *gin.Context) {
-	var f NotifyTestForm
-	ginx.BindJSON(c, &f)
-
-	hisEvents, err := models.AlertHisEventGetByIds(rt.Ctx, f.EventIDs)
-	ginx.Dangerous(err)
-
-	if len(hisEvents) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "event not found")
-	}
-
-	ginx.Dangerous(err)
-	events := []*models.AlertCurEvent{}
-	for _, he := range hisEvents {
-		event := he.ToCur()
-		event.SetTagsMap()
-		if dispatch.NotifyRuleApplicable(&f.NotifyConfig, event) {
-			events = append(events, event)
-		}
-	}
-
-	if len(events) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "not events applicable")
-	}
-
-	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, f.NotifyConfig.ChannelID, "", "", -1)
-	ginx.Dangerous(err)
-	if len(notifyChannels) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "notify channel not found")
-	}
-
-	notifyChannel := notifyChannels[0]
-
-	if !notifyChannel.Enable {
-		ginx.Bomb(http.StatusBadRequest, "notify channel not enabled, please enable it first")
-	}
-
-	tplContent := make(map[string]interface{})
-	if notifyChannel.RequestType != "flashtudy" {
-		messageTemplates, err := models.MessageTemplateGets(rt.Ctx, f.NotifyConfig.TemplateID, "", "")
-		ginx.Dangerous(err)
-		if len(messageTemplates) == 0 {
-			ginx.Bomb(http.StatusBadRequest, "message template not found")
-		}
-		tplContent = messageTemplates[0].RenderEvent(events)
-	}
-
-	var contactKey string
-	if notifyChannel.ParamConfig != nil && notifyChannel.ParamConfig.UserInfo != nil {
-		contactKey = notifyChannel.ParamConfig.UserInfo.ContactKey
-	}
-
-	sendtos, flashDutyChannelIDs, customParams := dispatch.GetNotifyConfigParams(&f.NotifyConfig, contactKey, rt.UserCache, rt.UserGroupCache)
-
-	var resp string
-	switch notifyChannel.RequestType {
-	case "flashduty":
-		client, err := models.GetHTTPClient(notifyChannel)
-		ginx.Dangerous(err)
-
-		for i := range flashDutyChannelIDs {
-			resp, err = notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], client)
-			if err != nil {
-				break
-			}
-		}
-		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		ginx.NewRender(c).Data(resp, err)
-	case "http":
-		client, err := models.GetHTTPClient(notifyChannel)
-		ginx.Dangerous(err)
-
-		if notifyChannel.RequestConfig == nil {
-			ginx.Bomb(http.StatusBadRequest, "request config not found")
-		}
-
-		if notifyChannel.RequestConfig.HTTPRequestConfig == nil {
-			ginx.Bomb(http.StatusBadRequest, "http request config not found")
-		}
-
-		if dispatch.NeedBatchContacts(notifyChannel.RequestConfig.HTTPRequestConfig) || len(sendtos) == 0 {
-			resp, err = notifyChannel.SendHTTP(events, tplContent, customParams, sendtos, client)
-			logger.Infof("channel_name: %v, event:%+v, sendtos:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], sendtos, tplContent, customParams, resp, err)
-			if err != nil {
-				logger.Errorf("failed to send http notify: %v", err)
-			}
-			ginx.NewRender(c).Data(resp, err)
-		} else {
-			for i := range sendtos {
-				resp, err = notifyChannel.SendHTTP(events, tplContent, customParams, []string{sendtos[i]}, client)
-				logger.Infof("channel_name: %v, event:%+v,  tplContent:%s, customParams:%v, sendto:%+v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, sendtos[i], resp, err)
-				if err != nil {
-					logger.Errorf("failed to send http notify: %v", err)
-					ginx.NewRender(c).Message(err)
-					return
-				}
-			}
-			ginx.NewRender(c).Message(err)
-		}
-
-	case "smtp":
-		if len(sendtos) == 0 {
-			ginx.Bomb(http.StatusBadRequest, "No valid email address in the user and team")
-		}
-		err := notifyChannel.SendEmailNow(events, tplContent, sendtos)
-		ginx.NewRender(c).Message(err)
-	case "script":
-		resp, _, err := notifyChannel.SendScript(events, tplContent, customParams, sendtos)
-		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		ginx.NewRender(c).Data(resp, err)
-	default:
-		logger.Errorf("unsupported request type: %v", notifyChannel.RequestType)
-		ginx.NewRender(c).Message(errors.New("unsupported request type"))
-	}
-}
-
-type paramList struct {
-	Name  string      `json:"name"`
-	CName string      `json:"cname"`
-	Value interface{} `json:"value"`
-}
-
-func (rt *Router) notifyRuleCustomParamsGet(c *gin.Context) {
-	notifyChannelID := ginx.QueryInt64(c, "notify_channel_id")
-
-	me := c.MustGet("user").(*models.User)
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	notifyChannel, err := models.NotifyChannelGet(rt.Ctx, "id=?", notifyChannelID)
-	ginx.Dangerous(err)
-
-	keyMap := make(map[string]string)
-	if notifyChannel == nil {
-		ginx.NewRender(c).Data([][]paramList{}, nil)
-		return
-	}
-
-	if notifyChannel.ParamConfig == nil {
-		ginx.NewRender(c).Data([][]paramList{}, nil)
-		return
-	}
-
-	for _, param := range notifyChannel.ParamConfig.Custom.Params {
-		keyMap[param.Key] = param.CName
-	}
-
-	lst, err := models.NotifyRulesGet(rt.Ctx, "", nil)
-	ginx.Dangerous(err)
-
-	res := make([][]paramList, 0)
-	filter := make(map[string]struct{})
-	for _, nr := range lst {
-		if !slice.HaveIntersection[int64](gids, nr.UserGroupIds) {
-			continue
-		}
-
-		for _, nc := range nr.NotifyConfigs {
-			if nc.ChannelID != notifyChannelID {
-				continue
-			}
-
-			list := make([]paramList, 0)
-			filterKey := ""
-			for key, value := range nc.Params {
-				// 找到在通知媒介中的自定义变量配置项，进行 cname 转换
-				cname, exsits := keyMap[key]
-				if exsits {
-					list = append(list, paramList{
-						Name:  key,
-						CName: cname,
-						Value: value,
-					})
-				}
-				filterKey += fmt.Sprintf("%s:%s,", key, value)
-			}
-			if _, ok := filter[filterKey]; ok {
-				continue
-			}
-			filter[filterKey] = struct{}{}
-			res = append(res, list)
-		}
-	}
-
-	ginx.NewRender(c).Data(res, nil)
-}

center/router/router_notify_tpl.go

@@ -45,7 +45,7 @@ func (rt *Router) notifyTplUpdateContent(c *gin.Context) {
 	ginx.Dangerous(err)
 
 	if notifyTpl.CreateBy != user.Username && !user.IsAdmin() {
-		ginx.Bomb(403, "forbidden")
+		ginx.Bomb(403, "no permission")
 	}
 
 	f.UpdateAt = time.Now().Unix()
@@ -64,7 +64,7 @@ func (rt *Router) notifyTplUpdate(c *gin.Context) {
 	ginx.Dangerous(err)
 
 	if notifyTpl.CreateBy != user.Username && !user.IsAdmin() {
-		ginx.Bomb(403, "forbidden")
+		ginx.Bomb(403, "no permission")
 	}
 
 	// get the count of the same channel and name but different id
@@ -162,10 +162,10 @@ func (rt *Router) notifyTplAdd(c *gin.Context) {
 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)
 
-	user := c.MustGet("user").(*models.User)
-	f.CreateBy = user.Username
-
-	f.Channel = strings.TrimSpace(f.Channel)
+        user := c.MustGet("user").(*models.User)
+        f.CreateBy = user.Username
+	
+        f.Channel = strings.TrimSpace(f.Channel)
 	ginx.Dangerous(templateValidate(f))
 
 	count, err := models.Count(models.DB(rt.Ctx).Model(&models.NotifyTpl{}).Where("channel = ? or name = ?", f.Channel, f.Name))
@@ -174,7 +174,7 @@ func (rt *Router) notifyTplAdd(c *gin.Context) {
 		ginx.Bomb(200, "Refuse to create duplicate channel(unique)")
 	}
 
-	f.CreateAt = time.Now().Unix()
+        f.CreateAt = time.Now().Unix()
 	ginx.NewRender(c).Message(f.Create(rt.Ctx))
 }
 
@@ -188,18 +188,8 @@ func (rt *Router) notifyTplDel(c *gin.Context) {
 	ginx.Dangerous(err)
 
 	if notifyTpl.CreateBy != user.Username && !user.IsAdmin() {
-		ginx.Bomb(403, "forbidden")
+		ginx.Bomb(403, "no permission")
 	}
 
 	ginx.NewRender(c).Message(f.NotifyTplDelete(rt.Ctx, id))
 }
-
-func (rt *Router) messageTemplateGets(c *gin.Context) {
-	id := ginx.QueryInt64(c, "id", 0)
-	name := ginx.QueryStr(c, "name", "")
-	ident := ginx.QueryStr(c, "ident", "")
-
-	tpls, err := models.MessageTemplateGets(rt.Ctx, id, name, ident)
-
-	ginx.NewRender(c).Data(tpls, err)
-}

center/router/router_query.go

@@ -1,266 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"sort"
-	"sync"
-
-	"github.com/ccfos/nightingale/v6/dscache"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-func CheckDsPerm(c *gin.Context, dsId int64, cate string, q interface{}) bool {
-	// todo: 后续需要根据 cate 判断是否需要权限
-	return true
-}
-
-type QueryFrom struct {
-	Queries []Query `json:"queries"`
-	Exps    []Exp   `json:"exps"`
-}
-
-type Query struct {
-	Ref    string      `json:"ref"`
-	Did    int64       `json:"ds_id"`
-	DsCate string      `json:"ds_cate"`
-	Query  interface{} `json:"query"`
-}
-
-type Exp struct {
-	Exp string `json:"exp"`
-	Ref string `json:"ref"`
-}
-
-type LogResp struct {
-	Total int64         `json:"total"`
-	List  []interface{} `json:"list"`
-}
-
-func QueryLogBatchConcurrently(anonymousAccess bool, ctx *gin.Context, f QueryFrom) (LogResp, error) {
-	var resp LogResp
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-	var errs []error
-
-	for _, q := range f.Queries {
-		if !anonymousAccess && !CheckDsPerm(ctx, q.Did, q.DsCate, q) {
-			return LogResp{}, fmt.Errorf("forbidden")
-		}
-
-		plug, exists := dscache.DsCache.Get(q.DsCate, q.Did)
-		if !exists {
-			logger.Warningf("cluster:%d not exists query:%+v", q.Did, q)
-			return LogResp{}, fmt.Errorf("cluster not exists")
-		}
-
-		wg.Add(1)
-		go func(query Query) {
-			defer wg.Done()
-
-			data, total, err := plug.QueryLog(ctx.Request.Context(), query.Query)
-			mu.Lock()
-			defer mu.Unlock()
-			if err != nil {
-				errMsg := fmt.Sprintf("query data error: %v query:%v\n ", err, query)
-				logger.Warningf(errMsg)
-				errs = append(errs, err)
-				return
-			}
-
-			m := make(map[string]interface{})
-			m["ref"] = query.Ref
-			m["ds_id"] = query.Did
-			m["ds_cate"] = query.DsCate
-			m["data"] = data
-
-			resp.List = append(resp.List, m)
-			resp.Total += total
-		}(q)
-	}
-
-	wg.Wait()
-
-	if len(errs) > 0 {
-		return LogResp{}, errs[0]
-	}
-
-	if len(resp.List) == 0 {
-		return LogResp{}, fmt.Errorf("no data")
-	}
-
-	return resp, nil
-}
-
-func (rt *Router) QueryLogBatch(c *gin.Context) {
-	var f QueryFrom
-	ginx.BindJSON(c, &f)
-
-	resp, err := QueryLogBatchConcurrently(rt.Center.AnonymousAccess.PromQuerier, c, f)
-	if err != nil {
-		ginx.Bomb(200, "err:%v", err)
-	}
-
-	ginx.NewRender(c).Data(resp, nil)
-}
-
-func QueryDataConcurrently(anonymousAccess bool, ctx *gin.Context, f models.QueryParam) ([]models.DataResp, error) {
-	var resp []models.DataResp
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-	var errs []error
-
-	for _, q := range f.Querys {
-		if !anonymousAccess && !CheckDsPerm(ctx, f.DatasourceId, f.Cate, q) {
-			return nil, fmt.Errorf("forbidden")
-		}
-
-		plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-		if !exists {
-			logger.Warningf("cluster:%d not exists", f.DatasourceId)
-			return nil, fmt.Errorf("cluster not exists")
-		}
-
-		wg.Add(1)
-		go func(query interface{}) {
-			defer wg.Done()
-
-			datas, err := plug.QueryData(ctx.Request.Context(), query)
-			if err != nil {
-				logger.Warningf("query data error: req:%+v err:%v", query, err)
-				mu.Lock()
-				errs = append(errs, err)
-				mu.Unlock()
-				return
-			}
-
-			logger.Debugf("query data: req:%+v resp:%+v", query, datas)
-			mu.Lock()
-			resp = append(resp, datas...)
-			mu.Unlock()
-		}(q)
-	}
-
-	wg.Wait()
-
-	if len(errs) > 0 {
-		return nil, errs[0]
-	}
-
-	// 面向API的统一处理
-	// 按照 .Metric 排序
-	// 确保仪表盘中相同图例的曲线颜色相同
-	if len(resp) > 1 {
-		sort.Slice(resp, func(i, j int) bool {
-			if resp[i].Metric != nil && resp[j].Metric != nil {
-				return resp[i].Metric.String() < resp[j].Metric.String()
-			}
-			return false
-		})
-	}
-
-	return resp, nil
-}
-
-func (rt *Router) QueryData(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	resp, err := QueryDataConcurrently(rt.Center.AnonymousAccess.PromQuerier, c, f)
-	if err != nil {
-		ginx.Bomb(200, "err:%v", err)
-	}
-
-	ginx.NewRender(c).Data(resp, nil)
-}
-
-// QueryLogConcurrently 并发查询日志
-func QueryLogConcurrently(anonymousAccess bool, ctx *gin.Context, f models.QueryParam) (LogResp, error) {
-	var resp LogResp
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-	var errs []error
-
-	for _, q := range f.Querys {
-		if !anonymousAccess && !CheckDsPerm(ctx, f.DatasourceId, f.Cate, q) {
-			return LogResp{}, fmt.Errorf("forbidden")
-		}
-
-		plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-		if !exists {
-			logger.Warningf("cluster:%d not exists query:%+v", f.DatasourceId, f)
-			return LogResp{}, fmt.Errorf("cluster not exists")
-		}
-
-		wg.Add(1)
-		go func(query interface{}) {
-			defer wg.Done()
-
-			data, total, err := plug.QueryLog(ctx.Request.Context(), query)
-			logger.Debugf("query log: req:%+v resp:%+v", query, data)
-			if err != nil {
-				errMsg := fmt.Sprintf("query data error: %v query:%v\n ", err, query)
-				logger.Warningf(errMsg)
-				mu.Lock()
-				errs = append(errs, err)
-				mu.Unlock()
-				return
-			}
-
-			mu.Lock()
-			resp.List = append(resp.List, data...)
-			resp.Total += total
-			mu.Unlock()
-		}(q)
-	}
-
-	wg.Wait()
-
-	if len(errs) > 0 {
-		return LogResp{}, errs[0]
-	}
-
-	if len(resp.List) == 0 {
-		return LogResp{}, fmt.Errorf("no data")
-	}
-
-	return resp, nil
-}
-
-func (rt *Router) QueryLogV2(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	resp, err := QueryLogConcurrently(rt.Center.AnonymousAccess.PromQuerier, c, f)
-	ginx.NewRender(c).Data(resp, err)
-}
-
-func (rt *Router) QueryLog(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	var resp []interface{}
-	for _, q := range f.Querys {
-		if !rt.Center.AnonymousAccess.PromQuerier && !CheckDsPerm(c, f.DatasourceId, f.Cate, q) {
-			ginx.Bomb(200, "forbidden")
-		}
-
-		plug, exists := dscache.DsCache.Get("elasticsearch", f.DatasourceId)
-		if !exists {
-			logger.Warningf("cluster:%d not exists", f.DatasourceId)
-			ginx.Bomb(200, "cluster not exists")
-		}
-
-		data, _, err := plug.QueryLog(c.Request.Context(), q)
-		if err != nil {
-			logger.Warningf("query data error: %v", err)
-			ginx.Bomb(200, "err:%v", err)
-			continue
-		}
-		resp = append(resp, data...)
-	}
-
-	ginx.NewRender(c).Data(resp, nil)
-}

center/router/router_recording_rule.go

@@ -6,10 +6,10 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/str"
 )
 
 func (rt *Router) recordingRuleGets(c *gin.Context) {
@@ -19,7 +19,7 @@ func (rt *Router) recordingRuleGets(c *gin.Context) {
 }
 
 func (rt *Router) recordingRuleGetsByGids(c *gin.Context) {
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
 		for _, gid := range gids {
 			rt.bgroCheck(c, gid)

center/router/router_role.go

@@ -21,9 +21,7 @@ func (rt *Router) permsGets(c *gin.Context) {
 	if user.IsAdmin() {
 		var lst []string
 		for _, ops := range cconf.Operations.Ops {
-			for _, op := range ops.Ops {
-				lst = append(lst, op.Name)
-			}
+			lst = append(lst, ops.Ops...)
 		}
 		ginx.NewRender(c).Data(lst, nil)
 		return

center/router/router_role_operation.go

@@ -11,32 +11,24 @@ import (
 )
 
 func (rt *Router) operationOfRole(c *gin.Context) {
-	var (
-		role           *models.Role
-		err            error
-		res            []string
-		roleOperations []string
-	)
-
 	id := ginx.UrlParamInt64(c, "id")
-	role, err = models.RoleGet(rt.Ctx, "id=?", id)
+	role, err := models.RoleGet(rt.Ctx, "id=?", id)
 	ginx.Dangerous(err)
 	if role == nil {
 		ginx.Bomb(http.StatusOK, "role not found")
 	}
 
 	if role.Name == "Admin" {
+		var lst []string
 		for _, ops := range cconf.Operations.Ops {
-			for i := range ops.Ops {
-				res = append(res, ops.Ops[i].Name)
-			}
+			lst = append(lst, ops.Ops...)
 		}
-	} else {
-		roleOperations, err = models.OperationsOfRole(rt.Ctx, []string{role.Name})
-		res = roleOperations
+		ginx.NewRender(c).Data(lst, nil)
+		return
 	}
 
-	ginx.NewRender(c).Data(res, err)
+	ops, err := models.OperationsOfRole(rt.Ctx, []string{role.Name})
+	ginx.NewRender(c).Data(ops, err)
 }
 
 func (rt *Router) roleBindOperation(c *gin.Context) {
@@ -60,19 +52,9 @@ func (rt *Router) roleBindOperation(c *gin.Context) {
 func (rt *Router) operations(c *gin.Context) {
 	var ops []cconf.Ops
 	for _, v := range rt.Operations.Ops {
-		newOp := cconf.Ops{
-			Name:  v.Name,
-			Cname: i18n.Sprintf(c.GetHeader("X-Language"), v.Cname),
-			Ops:   []cconf.SingleOp{},
-		}
-		for i := range v.Ops {
-			op := cconf.SingleOp{
-				Name:  v.Ops[i].Name,
-				Cname: i18n.Sprintf(c.GetHeader("X-Language"), v.Ops[i].Cname),
-			}
-			newOp.Ops = append(newOp.Ops, op)
-		}
-		ops = append(ops, newOp)
+		v.Cname = i18n.Sprintf(c.GetHeader("X-Language"), v.Cname)
+		ops = append(ops, v)
 	}
+
 	ginx.NewRender(c).Data(ops, nil)
 }

center/router/router_self.go

@@ -5,7 +5,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
 	"github.com/ccfos/nightingale/v6/pkg/secu"
-	"github.com/google/uuid"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -83,48 +82,3 @@ func (rt *Router) selfPasswordPut(c *gin.Context) {
 
 	ginx.NewRender(c).Message(user.ChangePassword(rt.Ctx, oldPassWord, newPassWord))
 }
-
-type tokenForm struct {
-	TokenName string `json:"token_name"`
-	Token     string `json:"token"`
-}
-
-func (rt *Router) getToken(c *gin.Context) {
-	username := c.MustGet("username").(string)
-	tokens, err := models.GetTokensByUsername(rt.Ctx, username)
-	ginx.NewRender(c).Data(tokens, err)
-}
-
-func (rt *Router) addToken(c *gin.Context) {
-	var f tokenForm
-	ginx.BindJSON(c, &f)
-
-	username := c.MustGet("username").(string)
-
-	tokens, err := models.GetTokensByUsername(rt.Ctx, username)
-	ginx.Dangerous(err)
-
-	for _, token := range tokens {
-		if token.TokenName == f.TokenName {
-			ginx.NewRender(c).Message("token name already exists")
-			return
-		}
-	}
-
-	token, err := models.AddToken(rt.Ctx, username, uuid.New().String(), f.TokenName)
-	ginx.NewRender(c).Data(token, err)
-}
-
-func (rt *Router) deleteToken(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	username := c.MustGet("username").(string)
-	tokenCount, err := models.CountToken(rt.Ctx, username)
-	ginx.Dangerous(err)
-
-	if tokenCount <= 1 {
-		ginx.NewRender(c).Message("cannot delete the last token")
-		return
-	}
-
-	ginx.NewRender(c).Message(models.DeleteToken(rt.Ctx, id))
-}

center/router/router_source_token.go

@@ -1,36 +0,0 @@
-package router
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/google/uuid"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-// sourceTokenAdd 生成新的源令牌
-func (rt *Router) sourceTokenAdd(c *gin.Context) {
-	var f models.SourceToken
-	ginx.BindJSON(c, &f)
-
-	if f.ExpireAt > 0 && f.ExpireAt <= time.Now().Unix() {
-		ginx.Bomb(http.StatusBadRequest, "expire time must be in the future")
-	}
-
-	token := uuid.New().String()
-
-	username := c.MustGet("username").(string)
-
-	f.Token = token
-	f.CreateBy = username
-	f.CreateAt = time.Now().Unix()
-
-	err := f.Add(rt.Ctx)
-	ginx.Dangerous(err)
-
-	go models.CleanupExpiredTokens(rt.Ctx)
-	ginx.NewRender(c).Data(token, nil)
-}

center/router/router_target.go

@@ -9,14 +9,13 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 	"github.com/ccfos/nightingale/v6/storage"
 
 	"github.com/gin-gonic/gin"
 	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/str"
 )
 
 type TargetQuery struct {
@@ -44,7 +43,7 @@ func (rt *Router) targetGetsByHostFilter(c *gin.Context) {
 }
 
 func (rt *Router) targetGets(c *gin.Context) {
-	bgids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	bgids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	query := ginx.QueryStr(c, "query", "")
 	limit := ginx.QueryInt(c, "limit", 30)
 	downtime := ginx.QueryInt64(c, "downtime", 0)
@@ -56,14 +55,7 @@ func (rt *Router) targetGets(c *gin.Context) {
 	hosts := queryStrListField(c, "hosts", ",", " ", "\n")
 
 	var err error
-	if len(bgids) > 0 {
-		// 如果用户当前查看的是未归组机器，会传入 bgids = [0]，此时是不需要校验的，故而排除这种情况
-		if !(len(bgids) == 1 && bgids[0] == 0) {
-			for _, gid := range bgids {
-				rt.bgroCheck(c, gid)
-			}
-		}
-	} else {
+	if len(bgids) == 0 {
 		user := c.MustGet("user").(*models.User)
 		if !user.IsAdmin() {
 			// 如果是非 admin 用户，全部对象的情况，找到用户有权限的业务组
@@ -280,9 +272,11 @@ func (rt *Router) validateTags(tags []string) error {
 }
 
 func (rt *Router) addTagsToTarget(target *models.Target, tags []string) error {
+	hostTagsMap := target.GetHostTagsMap()
 	for _, tag := range tags {
 		tagKey := strings.Split(tag, "=")[0]
-		if _, exist := target.TagsMap[tagKey]; exist {
+		if _, ok := hostTagsMap[tagKey]; ok ||
+			strings.Contains(target.Tags, tagKey+"=") {
 			return fmt.Errorf("duplicate tagkey(%s)", tagKey)
 		}
 	}
@@ -407,21 +401,6 @@ type targetBgidsForm struct {
 	Action  string   `json:"action"` // add del reset
 }
 
-func haveNeverGroupedIdent(ctx *ctx.Context, idents []string) (bool, error) {
-	for _, ident := range idents {
-		bgids, err := models.TargetGroupIdsGetByIdent(ctx, ident)
-		if err != nil {
-			return false, err
-		}
-
-		if len(bgids) <= 0 {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
 func (rt *Router) targetBindBgids(c *gin.Context) {
 	var f targetBgidsForm
 	var err error
@@ -461,18 +440,14 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if !can {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.Bomb(http.StatusForbidden, "No permission. You are not admin of BG(%s)", bg.Name)
 			}
 		}
-		isNeverGrouped, checkErr := haveNeverGroupedIdent(rt.Ctx, f.Idents)
-		ginx.Dangerous(checkErr)
 
-		if isNeverGrouped {
-			can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
-			ginx.Dangerous(err)
-			if !can {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
-			}
+		can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
+		ginx.Dangerous(err)
+		if !can {
+			ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
 		}
 	}
 
@@ -556,7 +531,7 @@ func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
 	ginx.Dangerous(err)
 
 	if len(nopri) > 0 {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
+		ginx.Bomb(http.StatusForbidden, "No permission to operate the targets: %s", strings.Join(nopri, ", "))
 	}
 }
 
@@ -577,27 +552,3 @@ func (rt *Router) targetsOfAlertRule(c *gin.Context) {
 
 	ginx.NewRender(c).Data(ret, err)
 }
-
-func (rt *Router) checkTargetsExistByIndent(idents []string) {
-	notExists, err := models.TargetNoExistIdents(rt.Ctx, idents)
-	ginx.Dangerous(err)
-
-	if len(notExists) > 0 {
-		ginx.Bomb(http.StatusBadRequest, "targets not exist: %s", strings.Join(notExists, ", "))
-	}
-}
-
-func (rt *Router) targetsOfHostQuery(c *gin.Context) {
-	var queries []models.HostQuery
-	ginx.BindJSON(c, &queries)
-
-	hostsQuery := models.GetHostsQuery(queries)
-	session := models.TargetFilterQueryBuild(rt.Ctx, hostsQuery, 0, 0)
-	var lst []*models.Target
-	err := session.Find(&lst).Error
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, err.Error())
-	}
-
-	ginx.NewRender(c).Data(lst, nil)
-}

center/router/router_task.go

@@ -1,16 +1,15 @@
 package router
 
 import (
-	"strings"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
+	"github.com/toolkits/pkg/str"
 )
 
 func (rt *Router) taskGets(c *gin.Context) {
@@ -41,7 +40,7 @@ func (rt *Router) taskGets(c *gin.Context) {
 }
 
 func (rt *Router) taskGetsByGids(c *gin.Context) {
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
 		for _, gid := range gids {
 			rt.bgroCheck(c, gid)
@@ -85,6 +84,20 @@ func (rt *Router) taskGetsByGids(c *gin.Context) {
 	}, nil)
 }
 
+type taskForm struct {
+	Title     string   `json:"title" binding:"required"`
+	Account   string   `json:"account" binding:"required"`
+	Batch     int      `json:"batch"`
+	Tolerance int      `json:"tolerance"`
+	Timeout   int      `json:"timeout"`
+	Pause     string   `json:"pause"`
+	Script    string   `json:"script" binding:"required"`
+	Args      string   `json:"args"`
+	Action    string   `json:"action" binding:"required"`
+	Creator   string   `json:"creator"`
+	Hosts     []string `json:"hosts" binding:"required"`
+}
+
 func (rt *Router) taskRecordAdd(c *gin.Context) {
 	var f *models.TaskRecord
 	ginx.BindJSON(c, &f)
@@ -99,21 +112,11 @@ func (rt *Router) taskAdd(c *gin.Context) {
 
 	var f models.TaskForm
 	ginx.BindJSON(c, &f)
-	// 把 f.Hosts 中的空字符串过滤掉
-	hosts := make([]string, 0, len(f.Hosts))
-	for i := range f.Hosts {
-		if strings.TrimSpace(f.Hosts[i]) != "" {
-			hosts = append(hosts, strings.TrimSpace(f.Hosts[i]))
-		}
-	}
-	f.Hosts = hosts
 
 	bgid := ginx.UrlParamInt64(c, "id")
 	user := c.MustGet("user").(*models.User)
 	f.Creator = user.Username
 
-	rt.checkTargetsExistByIndent(f.Hosts)
-
 	err := f.Verify()
 	ginx.Dangerous(err)
 

center/router/router_task_tpl.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -36,7 +35,7 @@ func (rt *Router) taskTplGetsByGids(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
 	limit := ginx.QueryInt(c, "limit", 20)
 
-	gids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
+	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
 		for _, gid := range gids {
 			rt.bgroCheck(c, gid)
@@ -119,18 +118,6 @@ type taskTplForm struct {
 	Hosts     []string `json:"hosts"`
 }
 
-func (f *taskTplForm) Verify() {
-	// 传入的 f.Hosts 可能是 []string{"", "a", "b"}，需要过滤掉空字符串
-	args := make([]string, 0, len(f.Hosts))
-	for _, ident := range f.Hosts {
-		if strings.TrimSpace(ident) != "" {
-			args = append(args, strings.TrimSpace(ident))
-		}
-	}
-
-	f.Hosts = args
-}
-
 func (rt *Router) taskTplAdd(c *gin.Context) {
 	if !rt.Ibex.Enable {
 		ginx.Bomb(400, i18n.Sprintf(c.GetHeader("X-Language"), "This functionality has not been enabled. Please contact the system administrator to activate it."))
@@ -139,13 +126,10 @@ func (rt *Router) taskTplAdd(c *gin.Context) {
 
 	var f taskTplForm
 	ginx.BindJSON(c, &f)
-	f.Verify()
 
 	user := c.MustGet("user").(*models.User)
 	now := time.Now().Unix()
 
-	rt.checkTargetsExistByIndent(f.Hosts)
-
 	sort.Strings(f.Tags)
 
 	tpl := &models.TaskTpl{
@@ -183,9 +167,6 @@ func (rt *Router) taskTplPut(c *gin.Context) {
 
 	var f taskTplForm
 	ginx.BindJSON(c, &f)
-	f.Verify()
-
-	rt.checkTargetsExistByIndent(f.Hosts)
 
 	sort.Strings(f.Tags)
 

center/router/router_tdengine.go

@@ -1,14 +1,14 @@
 package router
 
 import (
-	"fmt"
+	"net/http"
+
 	"github.com/ccfos/nightingale/v6/center/cconf"
-	"github.com/ccfos/nightingale/v6/datasource/tdengine"
-	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/models"
+
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"net/http"
+	"github.com/toolkits/pkg/logger"
 )
 
 type databasesQueryForm struct {
@@ -20,13 +20,13 @@ func (rt *Router) tdengineDatabases(c *gin.Context) {
 	var f databasesQueryForm
 	ginx.BindJSON(c, &f)
 
-	datasource, hit := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if _, ok := datasource.(*tdengine.TDengine); !hit || !ok {
+	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
+	if tdClient == nil {
 		ginx.NewRender(c, http.StatusNotFound).Message("No such datasource")
 		return
 	}
 
-	databases, err := datasource.(*tdengine.TDengine).ShowDatabases(rt.Ctx.Ctx)
+	databases, err := tdClient.GetDatabases()
 	ginx.NewRender(c).Data(databases, err)
 }
 
@@ -37,29 +37,18 @@ type tablesQueryForm struct {
 	IsStable     bool   `json:"is_stable"`
 }
 
-type Column struct {
-	Name string `json:"name"`
-	Type string `json:"type"`
-	Size int    `json:"size"`
-}
-
 // get tdengine tables
 func (rt *Router) tdengineTables(c *gin.Context) {
 	var f tablesQueryForm
 	ginx.BindJSON(c, &f)
 
-	datasource, hit := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if _, ok := datasource.(*tdengine.TDengine); !hit || !ok {
+	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
+	if tdClient == nil {
 		ginx.NewRender(c, http.StatusNotFound).Message("No such datasource")
 		return
 	}
 
-	database := fmt.Sprintf("%s.tables", f.Database)
-	if f.IsStable {
-		database = fmt.Sprintf("%s.stables", f.Database)
-	}
-
-	tables, err := datasource.(*tdengine.TDengine).ShowTables(rt.Ctx.Ctx, database)
+	tables, err := tdClient.GetTables(f.Database, f.IsStable)
 	ginx.NewRender(c).Data(tables, err)
 }
 
@@ -70,31 +59,50 @@ type columnsQueryForm struct {
 	Table        string `json:"table"`
 }
 
+// get tdengine columns
 func (rt *Router) tdengineColumns(c *gin.Context) {
 	var f columnsQueryForm
 	ginx.BindJSON(c, &f)
 
-	datasource, hit := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if _, ok := datasource.(*tdengine.TDengine); !hit || !ok {
+	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
+	if tdClient == nil {
 		ginx.NewRender(c, http.StatusNotFound).Message("No such datasource")
 		return
 	}
 
-	query := map[string]string{
-		"database": f.Database,
-		"table":    f.Table,
+	columns, err := tdClient.GetColumns(f.Database, f.Table)
+	ginx.NewRender(c).Data(columns, err)
+}
+
+func (rt *Router) QueryData(c *gin.Context) {
+	var f models.QueryParam
+	ginx.BindJSON(c, &f)
+
+	var resp []models.DataResp
+	var err error
+	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
+	for _, q := range f.Querys {
+		datas, err := tdClient.Query(q)
+		ginx.Dangerous(err)
+		resp = append(resp, datas...)
 	}
 
-	columns, err := datasource.(*tdengine.TDengine).DescribeTable(rt.Ctx.Ctx, query)
-	// 对齐前端，后续可以将 tdEngine 的查数据的接口都统一
-	tdColumns := make([]Column, len(columns))
-	for i, column := range columns {
-		tdColumns[i] = Column{
-			Name: column.Field,
-			Type: column.Type,
-		}
+	ginx.NewRender(c).Data(resp, err)
+}
+
+func (rt *Router) QueryLog(c *gin.Context) {
+	var f models.QueryParam
+	ginx.BindJSON(c, &f)
+
+	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
+	if len(f.Querys) == 0 {
+		ginx.Bomb(200, "querys is empty")
+		return
 	}
-	ginx.NewRender(c).Data(tdColumns, err)
+
+	data, err := tdClient.QueryLog(f.Querys[0])
+	logger.Debugf("tdengine query:%s result: %+v", f.Querys[0], data)
+	ginx.NewRender(c).Data(data, err)
 }
 
 // query sql template

center/router/router_user.go

@@ -47,27 +47,12 @@ func (rt *Router) userGets(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
 	order := ginx.QueryStr(c, "order", "username")
 	desc := ginx.QueryBool(c, "desc", false)
-	usernames := strings.Split(ginx.QueryStr(c, "usernames", ""), ",")
-	phones := strings.Split(ginx.QueryStr(c, "phones", ""), ",")
-	emails := strings.Split(ginx.QueryStr(c, "emails", ""), ",")
-
-	if len(usernames) == 1 && usernames[0] == "" {
-		usernames = []string{}
-	}
-
-	if len(phones) == 1 && phones[0] == "" {
-		phones = []string{}
-	}
-
-	if len(emails) == 1 && emails[0] == "" {
-		emails = []string{}
-	}
 
 	go rt.UserCache.UpdateUsersLastActiveTime()
 	total, err := models.UserTotal(rt.Ctx, query, stime, etime)
 	ginx.Dangerous(err)
 
-	list, err := models.UserGets(rt.Ctx, query, limit, ginx.Offset(c, limit), stime, etime, order, desc, usernames, phones, emails)
+	list, err := models.UserGets(rt.Ctx, query, limit, ginx.Offset(c, limit), stime, etime, order, desc)
 	ginx.Dangerous(err)
 
 	user := c.MustGet("user").(*models.User)

center/router/router_user_group.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
-	"github.com/ccfos/nightingale/v6/pkg/strx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/str"
 )
 
 func (rt *Router) checkBusiGroupPerm(c *gin.Context) {
@@ -32,7 +32,7 @@ func (rt *Router) userGroupGets(c *gin.Context) {
 }
 
 func (rt *Router) userGroupGetsByService(c *gin.Context) {
-	ids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "ids", ""))
+	ids := str.IdsInt64(ginx.QueryStr(c, "ids", ""))
 
 	if len(ids) == 0 {
 		lst, err := models.UserGroupGetAll(rt.Ctx)
@@ -111,6 +111,7 @@ func (rt *Router) userGroupPut(c *gin.Context) {
 
 	me := c.MustGet("user").(*models.User)
 	ug := c.MustGet("user_group").(*models.UserGroup)
+	oldUGName := ug.Name
 
 	if ug.Name != f.Name {
 		// name changed, check duplication
@@ -129,7 +130,7 @@ func (rt *Router) userGroupPut(c *gin.Context) {
 	if f.IsSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
 		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, ug)
 		ginx.Dangerous(err)
-		err = ugs.SyncUGPut()
+		err = ugs.SyncUGPut(oldUGName)
 		ginx.Dangerous(err)
 	}
 	ginx.NewRender(c).Message(ug.Update(rt.Ctx, "Name", "Note", "UpdateAt", "UpdateBy"))
@@ -158,11 +159,8 @@ func (rt *Router) userGroupDel(c *gin.Context) {
 	if isSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
 		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, ug)
 		ginx.Dangerous(err)
-		err = ugs.SyncUGDel()
-		// 如果team 在 duty 被引用或者已经删除，会报错，可以忽略报错
-		if err != nil {
-			logger.Warningf("failed to sync user group %s to flashduty's team: %v", ug.Name, err)
-		}
+		err = ugs.SyncUGDel(ug.Name)
+		ginx.Dangerous(err)
 	}
 	ginx.NewRender(c).Message(ug.Del(rt.Ctx))
 

center/router/router_user_variable_config.go

@@ -40,7 +40,7 @@ func (rt *Router) userVariableConfigPut(context *gin.Context) {
 	user := context.MustGet("user").(*models.User)
 	if !user.IsAdmin() && f.CreateBy != user.Username {
 		// only admin or creator can update
-		ginx.Bomb(403, "forbidden")
+		ginx.Bomb(403, "no permission")
 	}
 
 	ginx.NewRender(context).Message(models.ConfigsUserVariableUpdate(rt.Ctx, f))
@@ -54,7 +54,7 @@ func (rt *Router) userVariableConfigDel(context *gin.Context) {
 	user := context.MustGet("user").(*models.User)
 	if !user.IsAdmin() && configs.CreateBy != user.Username {
 		// only admin or creator can delete
-		ginx.Bomb(403, "forbidden")
+		ginx.Bomb(403, "no permission")
 	}
 
 	if configs != nil && configs.External == models.ConfigExternal {

cmd/edge/edge.go

@@ -12,18 +12,18 @@ import (
 	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/center/metas"
 	"github.com/ccfos/nightingale/v6/conf"
-	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/dumper"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
 	"github.com/ccfos/nightingale/v6/pkg/logx"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	pushgwrt "github.com/ccfos/nightingale/v6/pushgw/router"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
+	"github.com/ccfos/nightingale/v6/tdengine"
+
 	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )
 
@@ -54,15 +54,13 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
-	idents := idents.New(ctx, redis, config.Pushgw)
+	idents := idents.New(ctx, redis)
 	metas := metas.New(redis)
 	writers := writer.NewWriters(config.Pushgw)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
 
 	pushgwRouter.Config(r)
-	macros.RegisterMacro(macros.MacroInVain)
-	dscache.Init(ctx, false)
 
 	if !config.Alert.Disable {
 		configCache := memsto.NewConfigCache(ctx, syncStats, nil, "")
@@ -74,18 +72,16 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		userCache := memsto.NewUserCache(ctx, syncStats)
 		userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 		taskTplsCache := memsto.NewTaskTplCache(ctx)
-		notifyRuleCache := memsto.NewNotifyRuleCache(ctx, syncStats)
-		notifyChannelCache := memsto.NewNotifyChannelCache(ctx, syncStats)
-		messageTemplateCache := memsto.NewMessageTemplateCache(ctx, syncStats)
 
 		promClients := prom.NewPromClient(ctx)
 
 		dispatch.InitRegisterQueryFunc(promClients)
 
+		tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 		externalProcessors := process.NewExternalProcessors()
 
 		alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache,
-			alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)
+			alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
 
 		alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
 

datasource/ck/clickhouse.go

@@ -1,241 +0,0 @@
-package ck
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	ck "github.com/ccfos/nightingale/v6/dskit/clickhouse"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	CKType = "ck"
-
-	TimeFieldFormatEpochMilli  = "epoch_millis"
-	TimeFieldFormatEpochSecond = "epoch_second"
-
-	DefaultLimit = 500
-)
-
-var (
-	ckPrivBanned = []string{
-		"INSERT",
-		"CREATE",
-		"DROP",
-		"DELETE",
-		"UPDATE",
-		"ALL",
-	}
-
-	ckBannedOp = map[string]struct{}{
-		"CREATE":   {},
-		"INSERT":   {},
-		"ALTER":    {},
-		"REVOKE":   {},
-		"DROP":     {},
-		"RENAME":   {},
-		"ATTACH":   {},
-		"DETACH":   {},
-		"OPTIMIZE": {},
-		"TRUNCATE": {},
-		"SET":      {},
-	}
-)
-
-func init() {
-	datasource.RegisterDatasource(CKType, new(Clickhouse))
-}
-
-type CKShard struct {
-	Addr        string `json:"ck.addr" mapstructure:"ck.addr"`
-	User        string `json:"ck.user" mapstructure:"ck.user"`
-	Password    string `json:"ck.password" mapstructure:"ck.password"`
-	Database    string `json:"ck.db" mapstructure:"ck.db"`
-	IsEncrypted bool   `json:"ck.is_encrypt" mapstructure:"ck.is_encrypt"`
-}
-
-type QueryParam struct {
-	Limit      int             `json:"limit" mapstructure:"limit"`
-	Sql        string          `json:"sql" mapstructure:"sql"`
-	Ref        string          `json:"ref" mapstructure:"ref"`
-	From       int64           `json:"from" mapstructure:"from"`
-	To         int64           `json:"to" mapstructure:"to"`
-	TimeField  string          `json:"time_field" mapstructure:"time_field"`
-	TimeFormat string          `json:"time_format" mapstructure:"time_format"`
-	Keys       datasource.Keys `json:"keys" mapstructure:"keys"`
-	Database   string          `json:"database" mapstructure:"database"`
-	Table      string          `json:"table" mapstructure:"table"`
-}
-
-type Clickhouse struct {
-	ck.Clickhouse `json:",inline" mapstructure:",squash"`
-}
-
-func (c *Clickhouse) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(Clickhouse)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (c *Clickhouse) InitClient() error {
-	return c.InitCli()
-}
-
-func (c *Clickhouse) Validate(ctx context.Context) error {
-	if len(c.Nodes) == 0 {
-		return fmt.Errorf("ck shard is invalid, please check datasource setting")
-	}
-
-	addr := c.Nodes[0]
-	if len(strings.Trim(c.User, " ")) == 0 {
-		return fmt.Errorf("ck shard user is invalid, please check datasource setting")
-	}
-
-	if len(strings.Trim(addr, " ")) == 0 {
-		return fmt.Errorf("ck shard addr is invalid, please check datasource setting")
-	}
-
-	// if len(strings.Trim(shard.Password, " ")) == 0 {
-	// 	return fmt.Errorf("ck shard password is empty, please check datasource setting or set password for user")
-	// }
-
-	return nil
-}
-
-// Equal compares whether two objects are the same, used for caching
-func (c *Clickhouse) Equal(p datasource.Datasource) bool {
-
-	plg, ok := p.(*Clickhouse)
-	if !ok {
-		logger.Errorf("unexpected plugin type, expected is ck")
-		return false
-	}
-
-	// only compare first shard
-	if len(c.Nodes) == 0 {
-		logger.Errorf("ck shard is empty")
-		return false
-	}
-	addr := c.Nodes[0]
-
-	if len(plg.Nodes) == 0 {
-		logger.Errorf("new ck plugin obj shard is empty")
-		return false
-	}
-	newAddr := plg.Nodes[0]
-
-	if c.User != plg.User {
-		return false
-	}
-
-	if addr != newAddr {
-		return false
-	}
-
-	if c.Password != plg.Password {
-		return false
-	}
-
-	return true
-}
-
-func (c *Clickhouse) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (c *Clickhouse) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (c *Clickhouse) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (c *Clickhouse) QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error) {
-
-	ckQueryParam := new(ck.QueryParam)
-	if err := mapstructure.Decode(query, ckQueryParam); err != nil {
-		return nil, err
-	}
-
-	if strings.Contains(ckQueryParam.Sql, "$__") {
-		var err error
-		ckQueryParam.Sql, err = macros.Macro(ckQueryParam.Sql, ckQueryParam.From, ckQueryParam.To)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if ckQueryParam.Keys.ValueKey == "" {
-		return nil, fmt.Errorf("valueKey is required")
-	}
-
-	rows, err := c.QueryTimeseries(ctx, ckQueryParam)
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", ckQueryParam, err)
-		return nil, err
-	}
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", ckQueryParam, err)
-		return []models.DataResp{}, err
-	}
-	data := make([]models.DataResp, 0)
-	for i := range rows {
-		data = append(data, models.DataResp{
-			Ref:    ckQueryParam.Ref,
-			Metric: rows[i].Metric,
-			Values: rows[i].Values,
-		})
-	}
-
-	return data, nil
-}
-
-func (c *Clickhouse) QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error) {
-	ckQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, ckQueryParam); err != nil {
-		return nil, 0, err
-	}
-
-	if strings.Contains(ckQueryParam.Sql, "$__") {
-		var err error
-		ckQueryParam.Sql, err = macros.Macro(ckQueryParam.Sql, ckQueryParam.From, ckQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	rows, err := c.Query(ctx, ckQueryParam)
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", ckQueryParam, err)
-		return nil, 0, err
-	}
-
-	limit := getLimit(len(rows), ckQueryParam.Limit)
-
-	logs := make([]interface{}, 0)
-	for i := 0; i < limit; i++ {
-		logs = append(logs, rows[i])
-	}
-
-	return logs, int64(limit), nil
-}
-
-func getLimit(rowLen, pLimit int) int {
-	limit := DefaultLimit
-	if pLimit > 0 {
-		limit = pLimit
-	}
-	if rowLen > limit {
-		return limit
-	}
-
-	return rowLen
-}

datasource/commons/eslike/eslike.go

@@ -1,653 +0,0 @@
-package eslike
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/araddon/dateparse"
-	"github.com/bitly/go-simplejson"
-	"github.com/ccfos/nightingale/v6/memsto"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/mitchellh/mapstructure"
-	"github.com/olivere/elastic/v7"
-	"github.com/prometheus/common/model"
-	"github.com/toolkits/pkg/logger"
-)
-
-type Query struct {
-	Ref            string     `json:"ref" mapstructure:"ref"`
-	IndexType      string     `json:"index_type" mapstructure:"index_type"` // 普通索引:index 索引模式:index_pattern
-	Index          string     `json:"index" mapstructure:"index"`
-	IndexPatternId int64      `json:"index_pattern" mapstructure:"index_pattern"`
-	Filter         string     `json:"filter" mapstructure:"filter"`
-	Offset         int64      `json:"offset" mapstructure:"offset"`
-	MetricAggr     MetricAggr `json:"value" mapstructure:"value"`
-	GroupBy        []GroupBy  `json:"group_by" mapstructure:"group_by"`
-	DateField      string     `json:"date_field" mapstructure:"date_field"`
-	Interval       int64      `json:"interval" mapstructure:"interval"`
-	Start          int64      `json:"start" mapstructure:"start"`
-	End            int64      `json:"end" mapstructure:"end"`
-	P              int        `json:"page" mapstructure:"page"`           // 页码
-	Limit          int        `json:"limit" mapstructure:"limit"`         // 每页个数
-	Ascending      bool       `json:"ascending" mapstructure:"ascending"` // 按照DataField排序
-
-	Timeout  int `json:"timeout" mapstructure:"timeout"`
-	MaxShard int `json:"max_shard" mapstructure:"max_shard"`
-}
-
-type MetricAggr struct {
-	Field string `json:"field" mapstructure:"field"`
-	Func  string `json:"func" mapstructure:"func"`
-	Ref   string `json:"ref" mapstructure:"ref"` // 变量名，A B C
-}
-
-type GroupBy struct {
-	Cate        GroupByCate `json:"cate" mapstructure:"cate"` // 分组类型
-	Field       string      `json:"field" mapstructure:"field"`
-	MinDocCount int64       `json:"min_doc_count" mapstructure:"min_doc_count"`
-	Order       string      `json:"order" mapstructure:"order"`
-	OrderBy     string      `json:"order_by" mapstructure:"order_by"`
-	Size        int         `json:"size" mapstructure:"size"`
-
-	Params   []Param `json:"params" mapstructure:"params"`     // 类型是 filter 时使用
-	Interval int64   `json:"interval" mapstructure:"interval"` // 分组间隔
-}
-
-type SearchFunc func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error)
-type QueryFieldsFunc func(indices []string) ([]string, error)
-
-// 分组类型
-type GroupByCate string
-
-const (
-	Filters  GroupByCate = "filters"
-	Histgram GroupByCate = "histgram"
-	Terms    GroupByCate = "terms"
-)
-
-// 参数
-type Param struct {
-	Alias string `json:"alias,omitempty"` // 别名，a=b的形式，filter 特有
-	Query string `json:"query,omitempty"` // 查询条件，filter 特有
-}
-
-type MetricPtr struct {
-	Data map[string][][]float64
-}
-
-func IterGetMap(m, ret map[string]interface{}, prefixKey string) {
-	for k, v := range m {
-		switch v.(type) {
-		case map[string]interface{}:
-			var key string
-			if prefixKey != "" {
-				key = fmt.Sprintf("%s.%s", prefixKey, k)
-			} else {
-				key = k
-			}
-			IterGetMap(v.(map[string]interface{}), ret, key)
-		default:
-			ret[prefixKey+"."+k] = []interface{}{v}
-		}
-	}
-}
-
-func TransferData(metric, ref string, m map[string][][]float64) []models.DataResp {
-	var datas []models.DataResp
-
-	for k, v := range m {
-		data := models.DataResp{
-			Ref:    ref,
-			Metric: make(model.Metric),
-			Labels: k,
-			Values: v,
-		}
-
-		data.Metric["__name__"] = model.LabelValue(metric)
-		labels := strings.Split(k, "--")
-		for _, label := range labels {
-			arr := strings.SplitN(label, "=", 2)
-			if len(arr) == 2 {
-				data.Metric[model.LabelName(arr[0])] = model.LabelValue(arr[1])
-			}
-		}
-		datas = append(datas, data)
-	}
-
-	for i := 0; i < len(datas); i++ {
-		for k, v := range datas[i].Metric {
-			if k == "__name__" {
-				datas[i].Metric[k] = model.LabelValue(ref) + "_" + v
-			}
-		}
-	}
-
-	return datas
-}
-
-func GetQueryString(filter string, q *elastic.RangeQuery) *elastic.BoolQuery {
-	var queryString *elastic.BoolQuery
-	if filter != "" {
-		if strings.Contains(filter, ":") || strings.Contains(filter, "AND") || strings.Contains(filter, "OR") || strings.Contains(filter, "NOT") {
-			queryString = elastic.NewBoolQuery().Must(elastic.NewQueryStringQuery(filter)).Filter(q)
-		} else {
-			queryString = elastic.NewBoolQuery().Filter(elastic.NewMultiMatchQuery(filter).Lenient(true).Type("phrase")).Filter(q)
-		}
-	} else {
-		queryString = elastic.NewBoolQuery().Should(q)
-	}
-
-	return queryString
-}
-
-func getUnixTs(timeStr string) int64 {
-	ts, err := strconv.ParseInt(timeStr, 10, 64)
-	if err == nil {
-		return ts
-	}
-
-	parsedTime, err := dateparse.ParseAny(timeStr)
-	if err != nil {
-		logger.Error("failed to ParseAny: ", err)
-		return 0
-	}
-	return parsedTime.UnixMilli()
-}
-
-func GetBuckts(labelKey string, keys []string, arr []interface{}, metrics *MetricPtr, labels string, ts int64, f string) {
-	var err error
-	bucketsKey := ""
-	if len(keys) > 0 {
-		bucketsKey = keys[0]
-	}
-
-	newlabels := ""
-	for i := 0; i < len(arr); i++ {
-		tmp := arr[i].(map[string]interface{})
-		keyAsString, getTs := tmp["key_as_string"]
-		if getTs {
-			ts = getUnixTs(keyAsString.(string))
-		}
-		keyValue := tmp["key"]
-		switch keyValue.(type) {
-		case json.Number, string:
-			if !getTs {
-				if labels != "" {
-					newlabels = fmt.Sprintf("%s--%s=%v", labels, labelKey, keyValue)
-				} else {
-					newlabels = fmt.Sprintf("%s=%v", labelKey, keyValue)
-				}
-			}
-		default:
-			continue
-		}
-
-		var finalValue float64
-		if len(keys) == 0 { // 计算 doc_count 的情况
-			count := tmp["doc_count"]
-			finalValue, err = count.(json.Number).Float64()
-			if err != nil {
-				logger.Warningf("labelKey:%s get value error:%v", labelKey, err)
-			}
-			newValues := []float64{float64(ts / 1000), finalValue}
-			metrics.Data[newlabels] = append(metrics.Data[newlabels], newValues)
-			continue
-		}
-
-		innerBuckets, exists := tmp[bucketsKey]
-		if !exists {
-			continue
-		}
-
-		nextBucketsArr, exists := innerBuckets.(map[string]interface{})["buckets"]
-		if exists {
-			if len(keys[1:]) >= 1 {
-				GetBuckts(bucketsKey, keys[1:], nextBucketsArr.([]interface{}), metrics, newlabels, ts, f)
-			} else {
-				GetBuckts(bucketsKey, []string{}, nextBucketsArr.([]interface{}), metrics, newlabels, ts, f)
-			}
-		} else {
-
-			// doc_count
-			if f == "count" || f == "nodata" {
-				count := tmp["doc_count"]
-				finalValue, err = count.(json.Number).Float64()
-				if err != nil {
-					logger.Warningf("get %v value error:%v", count, err)
-				}
-			} else {
-				values, exists := innerBuckets.(map[string]interface{})["value"]
-				if exists {
-					switch values.(type) {
-					case json.Number:
-						value, err := values.(json.Number).Float64()
-						if err != nil {
-							logger.Warningf("labelKey:%s get value error:%v", labelKey, err)
-						}
-						finalValue = value
-					}
-				} else {
-					switch values.(type) {
-					case map[string]interface{}:
-						var err error
-						values := innerBuckets.(map[string]interface{})["values"]
-						for _, v := range values.(map[string]interface{}) {
-							finalValue, err = v.(json.Number).Float64()
-							if err != nil {
-								logger.Warningf("labelKey:%s get value error:%v", labelKey, err)
-							}
-						}
-					default:
-						values := innerBuckets.(map[string]interface{})["values"]
-						for _, v := range values.(map[string]interface{}) {
-							// Todo 修复 v is nil 导致 panic 情况
-							finalValue, err = v.(json.Number).Float64()
-							if err != nil {
-								logger.Warningf("labelKey:%s get value error:%v", labelKey, err)
-							}
-						}
-					}
-				}
-			}
-
-			if _, exists := metrics.Data[newlabels]; !exists {
-				metrics.Data[newlabels] = [][]float64{}
-			}
-
-			newValues := []float64{float64(ts / 1000), finalValue}
-			metrics.Data[newlabels] = append(metrics.Data[newlabels], newValues)
-		}
-	}
-}
-
-func MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(query, param); err != nil {
-		return nil, err
-	}
-
-	for i := 0; i < len(eventTags); i++ {
-		eventTags[i] = strings.Replace(eventTags[i], "=", ":", 1)
-	}
-
-	if len(eventTags) > 0 {
-		if param.Filter == "" {
-			param.Filter = strings.Join(eventTags, " AND ")
-		} else {
-			param.Filter = param.Filter + " AND " + strings.Join(eventTags, " AND ")
-		}
-	}
-
-	param.Start = start
-	param.End = end
-
-	return param, nil
-}
-
-func MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(query, param); err != nil {
-		return nil, err
-	}
-
-	for i := 0; i < len(eventTags); i++ {
-		eventTags[i] = strings.Replace(eventTags[i], "=", ":", 1)
-	}
-
-	if len(eventTags) > 0 {
-		if param.Filter == "" {
-			param.Filter = strings.Join(eventTags, " AND ")
-		} else {
-			param.Filter = param.Filter + " AND " + strings.Join(eventTags, " AND ")
-		}
-	}
-	param.Start = start
-	param.End = end
-
-	return param, nil
-}
-
-var esIndexPatternCache *memsto.EsIndexPatternCacheType
-
-func SetEsIndexPatternCacheType(c *memsto.EsIndexPatternCacheType) {
-	esIndexPatternCache = c
-}
-
-func GetEsIndexPatternCacheType() *memsto.EsIndexPatternCacheType {
-	return esIndexPatternCache
-}
-
-func QueryData(ctx context.Context, queryParam interface{}, cliTimeout int64, version string, search SearchFunc) ([]models.DataResp, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(queryParam, param); err != nil {
-		return nil, err
-	}
-
-	if param.Timeout == 0 {
-		param.Timeout = int(cliTimeout) / 1000
-	}
-
-	if param.Interval == 0 {
-		param.Interval = 60
-	}
-
-	if param.MaxShard < 1 {
-		param.MaxShard = 5
-	}
-
-	if param.DateField == "" {
-		param.DateField = "@timestamp"
-	}
-
-	var indexArr []string
-	if param.IndexType == "index_pattern" {
-		if ip, ok := GetEsIndexPatternCacheType().Get(param.IndexPatternId); ok {
-			param.DateField = ip.TimeField
-			indexArr = []string{ip.Name}
-			param.Index = ip.Name
-		} else {
-			return nil, fmt.Errorf("index pattern:%d not found", param.IndexPatternId)
-		}
-	} else {
-		indexArr = strings.Split(param.Index, ",")
-	}
-
-	q := elastic.NewRangeQuery(param.DateField)
-	now := time.Now().Unix()
-	var start, end int64
-	if param.End != 0 && param.Start != 0 {
-		end = param.End - param.End%param.Interval
-		start = param.Start - param.Start%param.Interval
-	} else {
-		end = now
-		start = end - param.Interval
-	}
-
-	delay, ok := ctx.Value("delay").(int64)
-	if ok && delay != 0 {
-		end = end - delay
-		start = start - delay
-	}
-
-	if param.Offset > 0 {
-		end = end - param.Offset
-		start = start - param.Offset
-	}
-
-	q.Gte(time.Unix(start, 0).UnixMilli())
-	q.Lte(time.Unix(end, 0).UnixMilli())
-	q.Format("epoch_millis")
-
-	field := param.MetricAggr.Field
-	groupBys := param.GroupBy
-
-	queryString := GetQueryString(param.Filter, q)
-
-	var aggr elastic.Aggregation
-	switch param.MetricAggr.Func {
-	case "avg":
-		aggr = elastic.NewAvgAggregation().Field(field)
-	case "max":
-		aggr = elastic.NewMaxAggregation().Field(field)
-	case "min":
-		aggr = elastic.NewMinAggregation().Field(field)
-	case "sum":
-		aggr = elastic.NewSumAggregation().Field(field)
-	case "count":
-		aggr = elastic.NewValueCountAggregation().Field(field)
-	case "p90":
-		aggr = elastic.NewPercentilesAggregation().Percentiles(90).Field(field)
-	case "p95":
-		aggr = elastic.NewPercentilesAggregation().Percentiles(95).Field(field)
-	case "p99":
-		aggr = elastic.NewPercentilesAggregation().Percentiles(99).Field(field)
-	case "median":
-		aggr = elastic.NewPercentilesAggregation().Percentiles(50).Field(field)
-	default:
-		return nil, fmt.Errorf("func %s not support", param.MetricAggr.Func)
-	}
-
-	tsAggr := elastic.NewDateHistogramAggregation().
-		Field(param.DateField).
-		MinDocCount(1)
-
-	if strings.HasPrefix(version, "7") {
-		tsAggr.FixedInterval(fmt.Sprintf("%ds", param.Interval))
-	} else {
-		// 兼容 7.0 以下的版本
-		// OpenSearch 也使用这个字段
-		tsAggr.Interval(fmt.Sprintf("%ds", param.Interval))
-	}
-
-	// group by
-	var groupByAggregation elastic.Aggregation
-	if len(groupBys) > 0 {
-		groupBy := groupBys[0]
-
-		if groupBy.MinDocCount == 0 {
-			groupBy.MinDocCount = 1
-		}
-
-		if groupBy.Size == 0 {
-			groupBy.Size = 300
-		}
-
-		switch groupBy.Cate {
-		case Terms:
-			if param.MetricAggr.Func != "count" {
-				groupByAggregation = elastic.NewTermsAggregation().Field(groupBy.Field).SubAggregation(field, aggr).OrderByKeyDesc().Size(groupBy.Size).MinDocCount(int(groupBy.MinDocCount))
-			} else {
-				groupByAggregation = elastic.NewTermsAggregation().Field(groupBy.Field).OrderByKeyDesc().Size(groupBy.Size).MinDocCount(int(groupBy.MinDocCount))
-			}
-		case Histgram:
-			if param.MetricAggr.Func != "count" {
-				groupByAggregation = elastic.NewHistogramAggregation().Field(groupBy.Field).Interval(float64(groupBy.Interval)).SubAggregation(field, aggr)
-			} else {
-				groupByAggregation = elastic.NewHistogramAggregation().Field(groupBy.Field).Interval(float64(groupBy.Interval))
-			}
-		case Filters:
-			for _, filterParam := range groupBy.Params {
-				if param.MetricAggr.Func != "count" {
-					groupByAggregation = elastic.NewFilterAggregation().Filter(elastic.NewTermQuery(filterParam.Query, "true")).SubAggregation(field, aggr)
-				} else {
-					groupByAggregation = elastic.NewFilterAggregation().Filter(elastic.NewTermQuery(filterParam.Query, "true"))
-				}
-			}
-		}
-
-		for i := 1; i < len(groupBys); i++ {
-			groupBy := groupBys[i]
-
-			if groupBy.MinDocCount == 0 {
-				groupBy.MinDocCount = 1
-			}
-
-			if groupBy.Size == 0 {
-				groupBy.Size = 300
-			}
-
-			switch groupBy.Cate {
-			case Terms:
-				groupByAggregation = elastic.NewTermsAggregation().Field(groupBy.Field).SubAggregation(groupBys[i-1].Field, groupByAggregation).OrderByKeyDesc().Size(groupBy.Size).MinDocCount(int(groupBy.MinDocCount))
-			case Histgram:
-				groupByAggregation = elastic.NewHistogramAggregation().Field(groupBy.Field).Interval(float64(groupBy.Interval)).SubAggregation(groupBys[i-1].Field, groupByAggregation)
-			case Filters:
-				for _, filterParam := range groupBy.Params {
-					groupByAggregation = elastic.NewFilterAggregation().Filter(elastic.NewTermQuery(filterParam.Query, "true")).SubAggregation(groupBys[i-1].Field, groupByAggregation)
-				}
-			}
-		}
-
-		tsAggr.SubAggregation(groupBys[len(groupBys)-1].Field, groupByAggregation)
-	} else if param.MetricAggr.Func != "count" {
-		tsAggr.SubAggregation(field, aggr)
-	}
-
-	source, _ := queryString.Source()
-	b, _ := json.Marshal(source)
-	logger.Debugf("query_data q:%+v indexArr:%+v tsAggr:%+v query_string:%s", param, indexArr, tsAggr, string(b))
-
-	searchSource := elastic.NewSearchSource().
-		Query(queryString).
-		Aggregation("ts", tsAggr)
-
-	searchSourceString, err := searchSource.Source()
-	if err != nil {
-		logger.Warningf("query_data searchSource:%s to string error:%v", searchSourceString, err)
-	}
-
-	jsonSearchSource, err := json.Marshal(searchSourceString)
-	if err != nil {
-		logger.Warningf("query_data searchSource:%s to json error:%v", searchSourceString, err)
-	}
-
-	result, err := search(ctx, indexArr, searchSource, param.Timeout, param.MaxShard)
-	if err != nil {
-		logger.Warningf("query_data searchSource:%s query_data error:%v", searchSourceString, err)
-		return nil, err
-	}
-
-	logger.Debugf("query_data searchSource:%s resp:%s", string(jsonSearchSource), string(result.Aggregations["ts"]))
-
-	js, err := simplejson.NewJson(result.Aggregations["ts"])
-	if err != nil {
-		return nil, err
-	}
-
-	bucketsData, err := js.Get("buckets").Array()
-	if err != nil {
-		return nil, err
-	}
-
-	var keys []string
-	for i := len(groupBys) - 1; i >= 0; i-- {
-		keys = append(keys, groupBys[i].Field)
-	}
-
-	if param.MetricAggr.Func != "count" {
-		keys = append(keys, field)
-	}
-
-	metrics := &MetricPtr{Data: make(map[string][][]float64)}
-
-	GetBuckts("", keys, bucketsData, metrics, "", 0, param.MetricAggr.Func)
-
-	items, err := TransferData(fmt.Sprintf("%s_%s", field, param.MetricAggr.Func), param.Ref, metrics.Data), nil
-
-	var m map[string]interface{}
-	bs, _ := json.Marshal(queryParam)
-	json.Unmarshal(bs, &m)
-	m["index"] = param.Index
-	for i := range items {
-		items[i].Query = fmt.Sprintf("%+v", m)
-	}
-	return items, nil
-}
-
-func HitFilter(typ string) bool {
-	switch typ {
-	case "keyword", "date", "long", "integer", "short", "byte", "double", "float", "half_float", "scaled_float", "unsigned_long":
-		return false
-	default:
-		return true
-	}
-}
-
-func QueryLog(ctx context.Context, queryParam interface{}, timeout int64, version string, maxShard int, search SearchFunc) ([]interface{}, int64, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(queryParam, param); err != nil {
-		return nil, 0, err
-	}
-
-	if param.Timeout == 0 {
-		param.Timeout = int(timeout)
-	}
-
-	var indexArr []string
-	if param.IndexType == "index_pattern" {
-		if ip, ok := GetEsIndexPatternCacheType().Get(param.IndexPatternId); ok {
-			param.DateField = ip.TimeField
-			indexArr = []string{ip.Name}
-		} else {
-			return nil, 0, fmt.Errorf("index pattern:%d not found", param.IndexPatternId)
-		}
-	} else {
-		indexArr = strings.Split(param.Index, ",")
-	}
-
-	now := time.Now().Unix()
-	var start, end int64
-	if param.End != 0 && param.Start != 0 {
-		end = param.End - param.End%param.Interval
-		start = param.Start - param.Start%param.Interval
-	} else {
-		end = now
-		start = end - param.Interval
-	}
-
-	q := elastic.NewRangeQuery(param.DateField)
-	q.Gte(time.Unix(start, 0).UnixMilli())
-	q.Lte(time.Unix(end, 0).UnixMilli())
-	q.Format("epoch_millis")
-
-	queryString := GetQueryString(param.Filter, q)
-
-	if param.Limit <= 0 {
-		param.Limit = 10
-	}
-
-	if param.MaxShard < 1 {
-		param.MaxShard = maxShard
-	}
-
-	source := elastic.NewSearchSource().
-		TrackTotalHits(true).
-		Query(queryString).
-		From(param.P).
-		Size(param.Limit).
-		Sort(param.DateField, param.Ascending)
-
-	result, err := search(ctx, indexArr, source, param.Timeout, param.MaxShard)
-	if err != nil {
-		logger.Warningf("query data error:%v", err)
-		return nil, 0, err
-	}
-
-	total := result.TotalHits()
-
-	var ret []interface{}
-
-	b, _ := json.Marshal(source)
-	logger.Debugf("query data result query source:%s len:%d total:%d", string(b), len(result.Hits.Hits), total)
-
-	resultBytes, _ := json.Marshal(result)
-	logger.Debugf("query data result query source:%s result:%s", string(b), string(resultBytes))
-
-	if strings.HasPrefix(version, "6") {
-		for i := 0; i < len(result.Hits.Hits); i++ {
-			var x map[string]interface{}
-			err := json.Unmarshal(result.Hits.Hits[i].Source, &x)
-			if err != nil {
-				logger.Warningf("Unmarshal soruce error:%v", err)
-				continue
-			}
-
-			if result.Hits.Hits[i].Fields == nil {
-				result.Hits.Hits[i].Fields = make(map[string]interface{})
-			}
-
-			IterGetMap(x, result.Hits.Hits[i].Fields, "")
-			ret = append(ret, result.Hits.Hits[i])
-		}
-	} else {
-		for _, hit := range result.Hits.Hits {
-			ret = append(ret, hit)
-		}
-	}
-
-	return ret, total, nil
-}

datasource/datasource.go

@@ -1,129 +0,0 @@
-package datasource
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type DatasourceType struct {
-	Id             int64  `json:"id"`
-	Category       string `json:"category"`
-	PluginType     string `json:"type"`
-	PluginTypeName string `json:"type_name"`
-}
-
-type Keys struct {
-	ValueKey   string `json:"valueKey" mapstructure:"valueKey"` // 多个用空格分隔
-	LabelKey   string `json:"labelKey" mapstructure:"labelKey"` // 多个用空格分隔
-	TimeKey    string `json:"timeKey" mapstructure:"timeKey"`
-	TimeFormat string `json:"timeFormat" mapstructure:"timeFormat"`
-}
-
-var DatasourceTypes map[int64]DatasourceType
-
-func init() {
-	DatasourceTypes = make(map[int64]DatasourceType)
-	DatasourceTypes[1] = DatasourceType{
-		Id:             1,
-		Category:       "timeseries",
-		PluginType:     "prometheus",
-		PluginTypeName: "Prometheus Like",
-	}
-
-	DatasourceTypes[2] = DatasourceType{
-		Id:             2,
-		Category:       "logging",
-		PluginType:     "elasticsearch",
-		PluginTypeName: "Elasticsearch",
-	}
-
-	DatasourceTypes[3] = DatasourceType{
-		Id:             3,
-		Category:       "logging",
-		PluginType:     "aliyun-sls",
-		PluginTypeName: "SLS",
-	}
-
-	DatasourceTypes[4] = DatasourceType{
-		Id:             4,
-		Category:       "timeseries",
-		PluginType:     "ck",
-		PluginTypeName: "ClickHouse",
-	}
-
-	DatasourceTypes[5] = DatasourceType{
-		Id:             5,
-		Category:       "timeseries",
-		PluginType:     "mysql",
-		PluginTypeName: "MySQL",
-	}
-
-	DatasourceTypes[6] = DatasourceType{
-		Id:             6,
-		Category:       "timeseries",
-		PluginType:     "pgsql",
-		PluginTypeName: "PostgreSQL",
-	}
-}
-
-type NewDatasrouceFn func(settings map[string]interface{}) (Datasource, error)
-
-var datasourceRegister = map[string]NewDatasrouceFn{}
-
-type Datasource interface {
-	Init(settings map[string]interface{}) (Datasource, error) // 初始化配置
-	InitClient() error                                        // 初始化客户端
-	Validate(ctx context.Context) error                       // 参数验证
-	Equal(p Datasource) bool                                  // 验证是否相等
-	MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error)
-	MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error)
-	QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error)
-	QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error)
-
-	// 在生成告警事件时，会调用该方法，用于获取额外的数据
-	QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error)
-}
-
-func RegisterDatasource(typ string, p Datasource) {
-	if _, found := datasourceRegister[typ]; found {
-		return
-	}
-	datasourceRegister[typ] = p.Init
-}
-
-func GetDatasourceByType(typ string, settings map[string]interface{}) (Datasource, error) {
-	typ = strings.ReplaceAll(typ, ".logging", "")
-	fn, found := datasourceRegister[typ]
-	if !found {
-		return nil, fmt.Errorf("plugin type %s not found", typ)
-	}
-
-	plug, err := fn(settings)
-	if err != nil {
-		return nil, err
-	}
-
-	return plug, nil
-}
-
-type DatasourceInfo struct {
-	Id             int64                  `json:"id"`
-	Name           string                 `json:"name"`
-	Identifier     string                 `json:"identifier"`
-	Description    string                 `json:"description"`
-	ClusterName    string                 `json:"cluster_name"`
-	Category       string                 `json:"category"`
-	PluginId       int64                  `json:"plugin_id"`
-	Type           string                 `json:"plugin_type"`
-	PluginTypeName string                 `json:"plugin_type_name"`
-	Settings       map[string]interface{} `json:"settings"`
-	HTTPJson       models.HTTP            `json:"http"`
-	AuthJson       models.Auth            `json:"auth"`
-	Status         string                 `json:"status"`
-	CreatedAt      int64                  `json:"created_at"`
-	UpdatedAt      int64                  `json:"updated_at"`
-	IsDefault      bool                   `json:"is_default"`
-}

datasource/es/es.go

@@ -1,409 +0,0 @@
-package es
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"reflect"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/datasource/commons/eslike"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/tlsx"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/olivere/elastic/v7"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	ESType = "elasticsearch"
-)
-
-type Elasticsearch struct {
-	Addr        string            `json:"es.addr" mapstructure:"es.addr"`
-	Nodes       []string          `json:"es.nodes" mapstructure:"es.nodes"`
-	Timeout     int64             `json:"es.timeout" mapstructure:"es.timeout"` // millis
-	Basic       BasicAuth         `json:"es.basic" mapstructure:"es.basic"`
-	TLS         TLS               `json:"es.tls" mapstructure:"es.tls"`
-	Version     string            `json:"es.version" mapstructure:"es.version"`
-	Headers     map[string]string `json:"es.headers" mapstructure:"es.headers"`
-	MinInterval int               `json:"es.min_interval" mapstructure:"es.min_interval"` // seconds
-	MaxShard    int               `json:"es.max_shard" mapstructure:"es.max_shard"`
-	ClusterName string            `json:"es.cluster_name" mapstructure:"es.cluster_name"`
-	EnableWrite bool              `json:"es.enable_write" mapstructure:"es.enable_write"` // 允许写操作
-	Client      *elastic.Client   `json:"es.client" mapstructure:"es.client"`
-}
-
-type TLS struct {
-	SkipTlsVerify bool `json:"es.tls.skip_tls_verify" mapstructure:"es.tls.skip_tls_verify"`
-}
-
-type BasicAuth struct {
-	Enable   bool   `json:"es.auth.enable" mapstructure:"es.auth.enable"`
-	Username string `json:"es.user" mapstructure:"es.user"`
-	Password string `json:"es.password" mapstructure:"es.password"`
-}
-
-func init() {
-	datasource.RegisterDatasource(ESType, new(Elasticsearch))
-}
-
-func (e *Elasticsearch) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(Elasticsearch)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (e *Elasticsearch) InitClient() error {
-	transport := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout: time.Duration(e.Timeout) * time.Millisecond,
-		}).DialContext,
-		ResponseHeaderTimeout: time.Duration(e.Timeout) * time.Millisecond,
-	}
-
-	if len(e.Nodes) > 0 {
-		e.Addr = e.Nodes[0]
-	}
-
-	if strings.Contains(e.Addr, "https") {
-		tlsConfig := tlsx.ClientConfig{
-			InsecureSkipVerify: e.TLS.SkipTlsVerify,
-			UseTLS:             true,
-		}
-		cfg, err := tlsConfig.TLSConfig()
-		if err != nil {
-			return err
-		}
-		transport.TLSClientConfig = cfg
-	}
-
-	var err error
-	options := []elastic.ClientOptionFunc{
-		elastic.SetURL(e.Nodes...),
-	}
-
-	if e.Basic.Username != "" {
-		options = append(options, elastic.SetBasicAuth(e.Basic.Username, e.Basic.Password))
-	}
-
-	headers := http.Header{}
-	for k, v := range e.Headers {
-		headers[k] = []string{v}
-	}
-
-	options = append(options, elastic.SetHeaders(headers))
-	options = append(options, elastic.SetHttpClient(&http.Client{Transport: transport}))
-	options = append(options, elastic.SetSniff(false))
-	options = append(options, elastic.SetHealthcheck(false))
-
-	e.Client, err = elastic.NewClient(options...)
-	return err
-}
-
-func (e *Elasticsearch) Equal(other datasource.Datasource) bool {
-	sort.Strings(e.Nodes)
-	sort.Strings(other.(*Elasticsearch).Nodes)
-
-	if strings.Join(e.Nodes, ",") != strings.Join(other.(*Elasticsearch).Nodes, ",") {
-		return false
-	}
-
-	if e.Basic.Username != other.(*Elasticsearch).Basic.Username {
-		return false
-	}
-
-	if e.Basic.Password != other.(*Elasticsearch).Basic.Password {
-		return false
-	}
-
-	if e.TLS.SkipTlsVerify != other.(*Elasticsearch).TLS.SkipTlsVerify {
-		return false
-	}
-	if e.EnableWrite != other.(*Elasticsearch).EnableWrite {
-		return false
-	}
-
-	if !reflect.DeepEqual(e.Headers, other.(*Elasticsearch).Headers) {
-		return false
-	}
-
-	return true
-}
-
-func (e *Elasticsearch) Validate(ctx context.Context) (err error) {
-	if len(e.Nodes) == 0 {
-		return fmt.Errorf("need a valid addr")
-	}
-
-	for _, addr := range e.Nodes {
-		_, err = url.Parse(addr)
-		if err != nil {
-			return fmt.Errorf("parse addr error: %v", err)
-		}
-	}
-
-	if e.Basic.Enable && (len(e.Basic.Username) == 0 || len(e.Basic.Password) == 0) {
-		return fmt.Errorf("need a valid user, password")
-	}
-
-	if e.MaxShard == 0 {
-		e.MaxShard = 5
-	}
-
-	if e.MinInterval < 10 {
-		e.MinInterval = 10
-	}
-
-	if e.Timeout == 0 {
-		e.Timeout = 60000
-	}
-
-	if !strings.HasPrefix(e.Version, "6") && !strings.HasPrefix(e.Version, "7") {
-		return fmt.Errorf("version must be 6.0+ or 7.0+")
-	}
-
-	return nil
-}
-
-func (e *Elasticsearch) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return eslike.MakeLogQuery(ctx, query, eventTags, start, end)
-}
-
-func (e *Elasticsearch) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return eslike.MakeTSQuery(ctx, query, eventTags, start, end)
-}
-
-func (e *Elasticsearch) QueryData(ctx context.Context, queryParam interface{}) ([]models.DataResp, error) {
-
-	search := func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error) {
-		return e.Client.Search().
-			Index(indices...).
-			IgnoreUnavailable(true).
-			Source(source).
-			Timeout(fmt.Sprintf("%ds", timeout)).
-			MaxConcurrentShardRequests(maxShard).
-			Do(ctx)
-	}
-
-	return eslike.QueryData(ctx, queryParam, e.Timeout, e.Version, search)
-}
-
-func (e *Elasticsearch) QueryIndices() ([]string, error) {
-	result, err := e.Client.IndexNames()
-
-	return result, err
-}
-
-func (e *Elasticsearch) QueryFields(indexs []string) ([]string, error) {
-	var fields []string
-	result, err := elastic.NewGetFieldMappingService(e.Client).Index(indexs...).IgnoreUnavailable(true).Do(context.Background())
-	if err != nil {
-		return fields, err
-	}
-
-	fieldMap := make(map[string]struct{})
-	for _, indexMap := range result {
-		if m, exists := indexMap.(map[string]interface{})["mappings"]; exists {
-			for k, v := range m.(map[string]interface{}) {
-				// 兼容 es6 版本
-				if k == "doc" && strings.HasPrefix(e.Version, "6") {
-					// if k == "doc" {
-					for kk, vv := range v.(map[string]interface{}) {
-						typ := getFieldType(kk, vv.(map[string]interface{}))
-						if eslike.HitFilter(typ) {
-							continue
-						}
-
-						if _, exsits := fieldMap[kk]; !exsits {
-							fieldMap[kk] = struct{}{}
-							fields = append(fields, kk)
-						}
-					}
-				} else {
-					// es7 版本
-					typ := getFieldType(k, v.(map[string]interface{}))
-					if eslike.HitFilter(typ) {
-						continue
-					}
-
-					if _, exsits := fieldMap[k]; !exsits {
-						fieldMap[k] = struct{}{}
-						fields = append(fields, k)
-					}
-				}
-
-			}
-		}
-	}
-
-	sort.Strings(fields)
-	return fields, nil
-}
-
-func (e *Elasticsearch) QueryLog(ctx context.Context, queryParam interface{}) ([]interface{}, int64, error) {
-
-	search := func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error) {
-		// 应该是之前为了获取 fields 字段，做的这个兼容
-		// fields, err := e.QueryFields(indices)
-		// if err != nil {
-		// 	logger.Warningf("query data error:%v", err)
-		// 	return nil, err
-		// }
-
-		// if source != nil && strings.HasPrefix(e.Version, "7") {
-		// 	source = source.(*elastic.SearchSource).DocvalueFields(fields...)
-		// }
-
-		return e.Client.Search().
-			Index(indices...).
-			IgnoreUnavailable(true).
-			MaxConcurrentShardRequests(maxShard).
-			Source(source).
-			Timeout(fmt.Sprintf("%ds", timeout)).
-			Do(ctx)
-	}
-
-	return eslike.QueryLog(ctx, queryParam, e.Timeout, e.Version, e.MaxShard, search)
-}
-
-func (e *Elasticsearch) QueryFieldValue(indexs []string, field string, query string) ([]string, error) {
-	var values []string
-	search := e.Client.Search().
-		IgnoreUnavailable(true).
-		Index(indexs...).
-		Size(0)
-
-	if query != "" {
-		search = search.Query(elastic.NewBoolQuery().Must(elastic.NewQueryStringQuery(query)))
-	}
-	search = search.Aggregation("distinct", elastic.NewTermsAggregation().Field(field).Size(10000))
-
-	result, err := search.Do(context.Background())
-	if err != nil {
-		return values, err
-	}
-
-	agg, found := result.Aggregations.Terms("distinct")
-	if !found {
-		return values, nil
-	}
-
-	for _, bucket := range agg.Buckets {
-		values = append(values, bucket.Key.(string))
-	}
-
-	return values, nil
-}
-
-func (e *Elasticsearch) Test(ctx context.Context) (err error) {
-	err = e.Validate(ctx)
-	if err != nil {
-		return err
-	}
-
-	if e.Addr == "" {
-		return fmt.Errorf("addr is invalid")
-	}
-
-	if e.Version == "7.10+" {
-		options := []elastic.ClientOptionFunc{
-			elastic.SetURL(e.Addr),
-		}
-
-		if e.Basic.Enable {
-			options = append(options, elastic.SetBasicAuth(e.Basic.Username, e.Basic.Password))
-		}
-
-		client, err := elastic.NewClient(options...)
-		if err != nil {
-			return fmt.Errorf("config is invalid:%v", err)
-		}
-
-		_, err = client.ElasticsearchVersion(e.Addr)
-		if err != nil {
-			return fmt.Errorf("config is invalid:%v", err)
-		}
-	} else {
-		return fmt.Errorf("version must be 7.10+")
-	}
-
-	return nil
-}
-
-func getFieldType(key string, m map[string]interface{}) string {
-	if innerMap, exists := m["mapping"]; exists {
-		if innerM, exists := innerMap.(map[string]interface{})[key]; exists {
-			if typ, exists := innerM.(map[string]interface{})["type"]; exists {
-				return typ.(string)
-			}
-		} else {
-			arr := strings.Split(key, ".")
-			if innerM, exists := innerMap.(map[string]interface{})[arr[len(arr)-1]]; exists {
-				if typ, exists := innerM.(map[string]interface{})["type"]; exists {
-					return typ.(string)
-				}
-			}
-		}
-	}
-	return ""
-}
-
-func (e *Elasticsearch) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	search := func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error) {
-
-		return e.Client.Search().
-			Index(indices...).
-			IgnoreUnavailable(true).
-			Source(source).
-			Timeout(fmt.Sprintf("%ds", timeout)).
-			Do(ctx)
-	}
-
-	param := new(eslike.Query)
-	if err := mapstructure.Decode(query, param); err != nil {
-		return nil, err
-	}
-	// 扩大查询范围, 解决上一次查询消耗时间太多，导致本次查询时间范围起止时间，滞后问题
-	param.Interval += 30
-
-	res, _, err := eslike.QueryLog(ctx, param, e.Timeout, e.Version, e.MaxShard, search)
-	if err != nil {
-		return nil, err
-	}
-
-	var result []map[string]string
-	for _, item := range res {
-		logger.Debugf("query:%v item:%v", query, item)
-		if itemMap, ok := item.(*elastic.SearchHit); ok {
-			mItem := make(map[string]string)
-			// 遍历 fields 字段的每个键值对
-			sourceMap := make(map[string]interface{})
-			err := json.Unmarshal(itemMap.Source, &sourceMap)
-			if err != nil {
-				logger.Warningf("unmarshal source%s error:%v", string(itemMap.Source), err)
-				continue
-			}
-
-			for k, v := range sourceMap {
-				mItem[k] = fmt.Sprintf("%v", v)
-			}
-
-			// 将处理好的 map 添加到 m 切片中
-			result = append(result, mItem)
-
-			// 只取第一条数据
-			break
-		}
-	}
-
-	return result, nil
-}

datasource/mysql/mysql.go

@@ -1,227 +0,0 @@
-package mysql
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/dskit/mysql"
-	"github.com/ccfos/nightingale/v6/dskit/sqlbase"
-	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	MySQLType = "mysql"
-)
-
-func init() {
-	datasource.RegisterDatasource(MySQLType, new(MySQL))
-}
-
-type MySQL struct {
-	mysql.MySQL `json:",inline" mapstructure:",squash"`
-}
-
-type QueryParam struct {
-	Ref      string          `json:"ref" mapstructure:"ref"`
-	Database string          `json:"database" mapstructure:"database"`
-	Table    string          `json:"table" mapstructure:"table"`
-	SQL      string          `json:"sql" mapstructure:"sql"`
-	Keys     datasource.Keys `json:"keys" mapstructure:"keys"`
-	From     int64           `json:"from" mapstructure:"from"`
-	To       int64           `json:"to" mapstructure:"to"`
-}
-
-func (m *MySQL) InitClient() error {
-	if len(m.Shards) == 0 {
-		return fmt.Errorf("not found mysql addr, please check datasource config")
-	}
-	if _, err := m.NewConn(context.TODO(), ""); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *MySQL) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(MySQL)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (m *MySQL) Validate(ctx context.Context) error {
-	if len(m.Shards) == 0 || len(strings.TrimSpace(m.Shards[0].Addr)) == 0 {
-		return fmt.Errorf("mysql addr is invalid, please check datasource setting")
-	}
-
-	if len(strings.TrimSpace(m.Shards[0].User)) == 0 {
-		return fmt.Errorf("mysql user is invalid, please check datasource setting")
-	}
-
-	return nil
-}
-
-// Equal compares whether two objects are the same, used for caching
-func (m *MySQL) Equal(p datasource.Datasource) bool {
-	newest, ok := p.(*MySQL)
-	if !ok {
-		logger.Errorf("unexpected plugin type, expected is mysql")
-		return false
-	}
-
-	if len(m.Shards) == 0 || len(newest.Shards) == 0 {
-		return false
-	}
-
-	oldShard := m.Shards[0]
-	newShard := newest.Shards[0]
-
-	if oldShard.Addr != newShard.Addr {
-		return false
-	}
-
-	if oldShard.User != newShard.User {
-		return false
-	}
-
-	if oldShard.Password != newShard.Password {
-		return false
-	}
-
-	if oldShard.MaxQueryRows != newShard.MaxQueryRows {
-		return false
-	}
-
-	if oldShard.Timeout != newShard.Timeout {
-		return false
-	}
-
-	if oldShard.MaxIdleConns != newShard.MaxIdleConns {
-		return false
-	}
-
-	if oldShard.MaxOpenConns != newShard.MaxOpenConns {
-		return false
-	}
-
-	if oldShard.ConnMaxLifetime != newShard.ConnMaxLifetime {
-		return false
-	}
-
-	return true
-}
-
-func (m *MySQL) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (m *MySQL) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (m *MySQL) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (m *MySQL) QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error) {
-	mysqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, mysqlQueryParam); err != nil {
-		return nil, err
-	}
-
-	if strings.Contains(mysqlQueryParam.SQL, "$__") {
-		var err error
-		mysqlQueryParam.SQL, err = macros.Macro(mysqlQueryParam.SQL, mysqlQueryParam.From, mysqlQueryParam.To)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if mysqlQueryParam.Keys.ValueKey == "" {
-		return nil, fmt.Errorf("valueKey is required")
-	}
-
-	timeout := m.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	items, err := m.QueryTimeseries(timeoutCtx, &sqlbase.QueryParam{
-		Sql: mysqlQueryParam.SQL,
-		Keys: types.Keys{
-			ValueKey: mysqlQueryParam.Keys.ValueKey,
-			LabelKey: mysqlQueryParam.Keys.LabelKey,
-			TimeKey:  mysqlQueryParam.Keys.TimeKey,
-		},
-	})
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", mysqlQueryParam, err)
-		return []models.DataResp{}, err
-	}
-	data := make([]models.DataResp, 0)
-	for i := range items {
-		data = append(data, models.DataResp{
-			Ref:    mysqlQueryParam.Ref,
-			Metric: items[i].Metric,
-			Values: items[i].Values,
-		})
-	}
-
-	return data, nil
-}
-
-func (m *MySQL) QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error) {
-	mysqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, mysqlQueryParam); err != nil {
-		return nil, 0, err
-	}
-
-	if strings.Contains(mysqlQueryParam.SQL, "$__") {
-		var err error
-		mysqlQueryParam.SQL, err = macros.Macro(mysqlQueryParam.SQL, mysqlQueryParam.From, mysqlQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	timeout := m.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	items, err := m.Query(timeoutCtx, &sqlbase.QueryParam{
-		Sql: mysqlQueryParam.SQL,
-	})
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", mysqlQueryParam, err)
-		return []interface{}{}, 0, err
-	}
-	logs := make([]interface{}, 0)
-	for i := range items {
-		logs = append(logs, items[i])
-	}
-
-	return logs, 0, nil
-}
-
-func (m *MySQL) DescribeTable(ctx context.Context, query interface{}) ([]*types.ColumnProperty, error) {
-	mysqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, mysqlQueryParam); err != nil {
-		return nil, err
-	}
-	return m.DescTable(ctx, mysqlQueryParam.Database, mysqlQueryParam.Table)
-}

datasource/postgresql/postgresql.go

@@ -1,346 +0,0 @@
-package postgresql
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
-
-	"github.com/ccfos/nightingale/v6/dskit/postgres"
-	"github.com/ccfos/nightingale/v6/dskit/sqlbase"
-	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/mitchellh/mapstructure"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	PostgreSQLType = "pgsql"
-)
-
-var (
-	regx = "(?i)from\\s+([a-zA-Z0-9_]+)\\.([a-zA-Z0-9_]+)\\.([a-zA-Z0-9_]+)"
-)
-
-func init() {
-	datasource.RegisterDatasource(PostgreSQLType, new(PostgreSQL))
-}
-
-type PostgreSQL struct {
-	Shards []*postgres.PostgreSQL `json:"pgsql.shards" mapstructure:"pgsql.shards"`
-}
-
-type QueryParam struct {
-	Ref      string          `json:"ref" mapstructure:"ref"`
-	Database string          `json:"database" mapstructure:"database"`
-	Table    string          `json:"table" mapstructure:"table"`
-	SQL      string          `json:"sql" mapstructure:"sql"`
-	Keys     datasource.Keys `json:"keys" mapstructure:"keys"`
-	From     int64           `json:"from" mapstructure:"from"`
-	To       int64           `json:"to" mapstructure:"to"`
-}
-
-func (p *PostgreSQL) InitClient() error {
-	if len(p.Shards) == 0 {
-		return fmt.Errorf("not found postgresql addr, please check datasource config")
-	}
-	for _, shard := range p.Shards {
-		if db, err := shard.NewConn(context.TODO(), "postgres"); err != nil {
-			defer sqlbase.CloseDB(db)
-			return err
-		}
-	}
-	return nil
-}
-
-func (p *PostgreSQL) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(PostgreSQL)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (p *PostgreSQL) Validate(ctx context.Context) error {
-	if len(p.Shards) == 0 || len(strings.TrimSpace(p.Shards[0].Addr)) == 0 {
-		return fmt.Errorf("postgresql addr is invalid, please check datasource setting")
-	}
-
-	if len(strings.TrimSpace(p.Shards[0].User)) == 0 {
-		return fmt.Errorf("postgresql user is invalid, please check datasource setting")
-	}
-
-	return nil
-}
-
-// Equal compares whether two objects are the same, used for caching
-func (p *PostgreSQL) Equal(d datasource.Datasource) bool {
-	newest, ok := d.(*PostgreSQL)
-	if !ok {
-		logger.Errorf("unexpected plugin type, expected is postgresql")
-		return false
-	}
-
-	if len(p.Shards) == 0 || len(newest.Shards) == 0 {
-		return false
-	}
-
-	oldShard := p.Shards[0]
-	newShard := newest.Shards[0]
-
-	if oldShard.Addr != newShard.Addr {
-		return false
-	}
-
-	if oldShard.User != newShard.User {
-		return false
-	}
-
-	if oldShard.Password != newShard.Password {
-		return false
-	}
-
-	if oldShard.MaxQueryRows != newShard.MaxQueryRows {
-		return false
-	}
-
-	if oldShard.Timeout != newShard.Timeout {
-		return false
-	}
-
-	if oldShard.MaxIdleConns != newShard.MaxIdleConns {
-		return false
-	}
-
-	if oldShard.MaxOpenConns != newShard.MaxOpenConns {
-		return false
-	}
-
-	if oldShard.ConnMaxLifetime != newShard.ConnMaxLifetime {
-		return false
-	}
-
-	return true
-}
-
-func (p *PostgreSQL) ShowDatabases(ctx context.Context) ([]string, error) {
-	return p.Shards[0].ShowDatabases(ctx, "")
-}
-
-func (p *PostgreSQL) ShowTables(ctx context.Context, database string) ([]string, error) {
-	p.Shards[0].DB = database
-	rets, err := p.Shards[0].ShowTables(ctx, "")
-	if err != nil {
-		return nil, err
-	}
-	tables := make([]string, 0, len(rets))
-	for scheme, tabs := range rets {
-		for _, tab := range tabs {
-			tables = append(tables, scheme+"."+tab)
-		}
-	}
-	return tables, nil
-}
-
-func (p *PostgreSQL) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (p *PostgreSQL) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (p *PostgreSQL) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (p *PostgreSQL) QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error) {
-	postgresqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, postgresqlQueryParam); err != nil {
-		return nil, err
-	}
-
-	if strings.Contains(postgresqlQueryParam.SQL, "$__") {
-		var err error
-		postgresqlQueryParam.SQL, err = macros.Macro(postgresqlQueryParam.SQL, postgresqlQueryParam.From, postgresqlQueryParam.To)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if postgresqlQueryParam.Database != "" {
-		p.Shards[0].DB = postgresqlQueryParam.Database
-	} else {
-		db, err := parseDBName(postgresqlQueryParam.SQL)
-		if err != nil {
-			return nil, err
-		}
-		p.Shards[0].DB = db
-	}
-
-	timeout := p.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	items, err := p.Shards[0].QueryTimeseries(timeoutCtx, &sqlbase.QueryParam{
-		Sql: postgresqlQueryParam.SQL,
-		Keys: types.Keys{
-			ValueKey: postgresqlQueryParam.Keys.ValueKey,
-			LabelKey: postgresqlQueryParam.Keys.LabelKey,
-			TimeKey:  postgresqlQueryParam.Keys.TimeKey,
-		},
-	})
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", postgresqlQueryParam, err)
-		return []models.DataResp{}, err
-	}
-	data := make([]models.DataResp, 0)
-	for i := range items {
-		data = append(data, models.DataResp{
-			Ref:    postgresqlQueryParam.Ref,
-			Metric: items[i].Metric,
-			Values: items[i].Values,
-		})
-	}
-
-	// parse resp to time series data
-	logger.Infof("req:%+v keys:%+v \n data:%v", postgresqlQueryParam, postgresqlQueryParam.Keys, data)
-
-	return data, nil
-}
-
-func (p *PostgreSQL) QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error) {
-	postgresqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, postgresqlQueryParam); err != nil {
-		return nil, 0, err
-	}
-	if postgresqlQueryParam.Database != "" {
-		p.Shards[0].DB = postgresqlQueryParam.Database
-	} else {
-		db, err := parseDBName(postgresqlQueryParam.SQL)
-		if err != nil {
-			return nil, 0, err
-		}
-		p.Shards[0].DB = db
-	}
-
-	if strings.Contains(postgresqlQueryParam.SQL, "$__") {
-		var err error
-		postgresqlQueryParam.SQL, err = macros.Macro(postgresqlQueryParam.SQL, postgresqlQueryParam.From, postgresqlQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	timeout := p.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-	items, err := p.Shards[0].Query(timeoutCtx, &sqlbase.QueryParam{
-		Sql: postgresqlQueryParam.SQL,
-	})
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", postgresqlQueryParam, err)
-		return []interface{}{}, 0, err
-	}
-	logs := make([]interface{}, 0)
-	for i := range items {
-		logs = append(logs, items[i])
-	}
-
-	return logs, 0, nil
-}
-
-func (p *PostgreSQL) DescribeTable(ctx context.Context, query interface{}) ([]*types.ColumnProperty, error) {
-	postgresqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, postgresqlQueryParam); err != nil {
-		return nil, err
-	}
-	p.Shards[0].DB = postgresqlQueryParam.Database
-	pairs := strings.Split(postgresqlQueryParam.Table, ".") // format: scheme.table_name
-	scheme := ""
-	table := postgresqlQueryParam.Table
-	if len(pairs) == 2 {
-		scheme = pairs[0]
-		table = pairs[1]
-	}
-	return p.Shards[0].DescTable(ctx, scheme, table)
-}
-
-func parseDBName(sql string) (db string, err error) {
-	re := regexp.MustCompile(regx)
-	matches := re.FindStringSubmatch(sql)
-	if len(matches) != 4 {
-		return "", fmt.Errorf("no valid table name in format database.schema.table found")
-	}
-	return matches[1], nil
-}
-
-func extractColumns(sql string) ([]string, error) {
-	// 将 SQL 转换为小写以简化匹配
-	sql = strings.ToLower(sql)
-
-	// 匹配 SELECT 和 FROM 之间的内容
-	re := regexp.MustCompile(`select\s+(.*?)\s+from`)
-	matches := re.FindStringSubmatch(sql)
-
-	if len(matches) < 2 {
-		return nil, fmt.Errorf("no columns found or invalid SQL syntax")
-	}
-
-	// 提取列部分
-	columnsString := matches[1]
-
-	// 分割列
-	columns := splitColumns(columnsString)
-
-	// 清理每个列名
-	for i, col := range columns {
-		columns[i] = strings.TrimSpace(col)
-	}
-
-	return columns, nil
-}
-
-func splitColumns(columnsString string) []string {
-	var columns []string
-	var currentColumn strings.Builder
-	parenthesesCount := 0
-	inQuotes := false
-
-	for _, char := range columnsString {
-		switch char {
-		case '(':
-			parenthesesCount++
-			currentColumn.WriteRune(char)
-		case ')':
-			parenthesesCount--
-			currentColumn.WriteRune(char)
-		case '\'', '"':
-			inQuotes = !inQuotes
-			currentColumn.WriteRune(char)
-		case ',':
-			if parenthesesCount == 0 && !inQuotes {
-				columns = append(columns, currentColumn.String())
-				currentColumn.Reset()
-			} else {
-				currentColumn.WriteRune(char)
-			}
-		default:
-			currentColumn.WriteRune(char)
-		}
-	}
-
-	if currentColumn.Len() > 0 {
-		columns = append(columns, currentColumn.String())
-	}
-
-	return columns
-}

datasource/prom/prom.go

@@ -1,15 +0,0 @@
-package prom
-
-type Prometheus struct {
-	PrometheusAddr  string `json:"prometheus.addr"`
-	PrometheusBasic struct {
-		PrometheusUser string `json:"prometheus.user"`
-		PrometheusPass string `json:"prometheus.password"`
-	} `json:"prometheus.basic"`
-	Headers           map[string]string `json:"prometheus.headers"`
-	PrometheusTimeout int64             `json:"prometheus.timeout"`
-	ClusterName       string            `json:"prometheus.cluster_name"`
-	WriteAddr         string            `json:"prometheus.write_addr"`
-	TsdbType          string            `json:"prometheus.tsdb_type"`
-	InternalAddr      string            `json:"prometheus.internal_addr"`
-}

docker/compose-bridge/etc-nightingale/config.toml

@@ -5,7 +5,7 @@ RunMode = "release"
 # log write dir
 Dir = "logs"
 # log level: DEBUG INFO WARNING ERROR
-Level = "INFO"
+Level = "DEBUG"
 # stdout, stderr, file
 Output = "stdout"
 # # rotate by time
@@ -61,10 +61,6 @@ AccessExpired = 1500
 RefreshExpired = 10080
 RedisKeyPrefix = "/jwt/"
 
-[HTTP.TokenAuth]
-Enable = false
-HeaderUserTokenKey = "X-User-Token"
-
 [HTTP.ProxyAuth]
 # if proxy auth enabled, jwt auth is disabled
 Enable = false
@@ -75,6 +71,15 @@ DefaultRoles = ["Standard"]
 [HTTP.RSA]
 # open RSA
 OpenRSA = false
+# Before replacing the key file, make sure that there are no encrypted variables in the database "configs".
+# It is recommended to decrypt and remove all encrypted values from the database before replacing the key file.
+# This will prevent any potential issues with accessing or decrypting the variables using the new key file.
+# RSA public key (auto carete)
+RSAPublicKeyPath = "etc/rsa/public.pem"
+# RSA private key (auto carete)
+RSAPrivateKeyPath = "etc/rsa/private.pem"
+# RSA private key password
+RSAPassWord = "n9e@n9e!"
 
 [DB]
 # postgres: DSN="host=127.0.0.1 port=5432 user=root dbname=n9e_v6 password=1234 sslmode=disable"
@@ -129,6 +134,8 @@ AlertDetail = false
 [Pushgw]
 # use target labels in database instead of in series
 LabelRewrite = true
+# # default busigroup key name
+# BusiGroupLabelKey = "busigroup"
 ForceUseServerTS = true
 
 # [Pushgw.DebugSample]

docker/compose-host-network-metric-log/etc-nightingale/config.toml

@@ -5,7 +5,7 @@ RunMode = "release"
 # log write dir
 Dir = "logs"
 # log level: DEBUG INFO WARNING ERROR
-Level = "INFO"
+Level = "DEBUG"
 # stdout, stderr, file
 Output = "file"
 # # rotate by time
@@ -71,6 +71,15 @@ DefaultRoles = ["Standard"]
 [HTTP.RSA]
 # open RSA
 OpenRSA = false
+# Before replacing the key file, make sure that there are no encrypted variables in the database "configs".
+# It is recommended to decrypt and remove all encrypted values from the database before replacing the key file.
+# This will prevent any potential issues with accessing or decrypting the variables using the new key file.
+# RSA public key (auto carete)
+RSAPublicKeyPath = "etc/rsa/public.pem"
+# RSA private key (auto carete)
+RSAPrivateKeyPath = "etc/rsa/private.pem"
+# RSA private key password
+RSAPassWord = "n9e@n9e!"
 
 [DB]
 # postgres: host=%s port=%s user=%s dbname=%s password=%s sslmode=%s
@@ -126,6 +135,8 @@ AlertDetail = true
 [Pushgw]
 # use target labels in database instead of in series
 LabelRewrite = true
+# # default busigroup key name
+# BusiGroupLabelKey = "busigroup"
 ForceUseServerTS = true
 
 # [Pushgw.DebugSample]

docker/compose-host-network/etc-nightingale/config.toml

@@ -5,7 +5,7 @@ RunMode = "release"
 # log write dir
 Dir = "logs"
 # log level: DEBUG INFO WARNING ERROR
-Level = "INFO"
+Level = "DEBUG"
 # stdout, stderr, file
 Output = "stdout"
 # # rotate by time
@@ -71,6 +71,15 @@ DefaultRoles = ["Standard"]
 [HTTP.RSA]
 # open RSA
 OpenRSA = false
+# Before replacing the key file, make sure that there are no encrypted variables in the database "configs".
+# It is recommended to decrypt and remove all encrypted values from the database before replacing the key file.
+# This will prevent any potential issues with accessing or decrypting the variables using the new key file.
+# RSA public key (auto carete)
+RSAPublicKeyPath = "etc/rsa/public.pem"
+# RSA private key (auto carete)
+RSAPrivateKeyPath = "etc/rsa/private.pem"
+# RSA private key password
+RSAPassWord = "n9e@n9e!"
 
 [DB]
 # postgres: host=%s port=%s user=%s dbname=%s password=%s sslmode=%s
@@ -126,6 +135,8 @@ AlertDetail = true
 [Pushgw]
 # use target labels in database instead of in series
 LabelRewrite = true
+# # default busigroup key name
+# BusiGroupLabelKey = "busigroup"
 ForceUseServerTS = true
 
 # [Pushgw.DebugSample]