network bg label migrate

.github/workflows/n9e.yml

@@ -5,7 +5,7 @@ on:
     tags:
       - 'v*'
 env:
-  GO_VERSION: 1.23
+  GO_VERSION: 1.18
 
 jobs:
   goreleaser:

.gitignore

@@ -9,7 +9,6 @@
 *.o
 *.a
 *.so
-*.db
 *.sw[po]
 *.tar.gz
 *.[568vq]
@@ -65,7 +64,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

@@ -29,25 +29,19 @@
 
 ## 夜莺 Nightingale 是什么
 
-> 夜莺 Nightingale 是什么，解决什么问题？以大家都很熟悉的 Grafana 做个类比，Grafana 擅长对接各种各样的数据源，然后提供灵活、强大、好看的可视化面板。夜莺则擅长对接各种多样的数据源，提供灵活、强大、高效的监控告警管理能力。从发展路径和定位来说，夜莺和 Grafana 很像，可以总结为一句话：可视化就用 Grafana，监控告警就找夜莺。
->
-> 在可视化领域，Grafana 是毫无争议的领导者，Grafana 在影响力、装机量、用户群、开发者数量等各个维度的数字上，相比夜莺都是追赶的榜样。巨无霸往往都是从一个切入点打开局面的，Grafana Labs 有了在可视化领域 Grafana 这个王牌，逐步扩展到整个可观测性方向，比如 Logging 维度有 Loki，Tracing 维度有 Tempo，Profiling 维度有收购来的 Pyroscope，On-call 维度有同样是收购来的 Grafana-OnCall 项目，还有时序数据库 Mimir、eBPF 采集器 Beyla、OpenTelemetry 采集器 Alloy、前端监控 SDK Faro，最终构成了一个完整的可观测性工具矩阵，但整个飞轮都是从 Grafana 项目开始转动起来的。
->
->夜莺，则是从监控告警这个切入点打开局面，也逐步横向做了相应扩展，比如夜莺也自研了可视化面板，如果你想有一个 all-in-one 的监控告警+可视化的工具，那么用夜莺也是正确的选择；比如 OnCall 方向，夜莺可以和 [Flashduty SaaS](https://flashcat.cloud/product/flashcat-duty/) 服务无缝的集成；在采集器方向，夜莺有配套的 [Categraf](https://flashcat.cloud/product/categraf)，可以一个采集器中管理所有的 exporter，并同时支持指标和日志的采集，极大减轻工程师维护的采集器数量和工作量（这个点太痛了，你可能也遇到过业务团队吐槽采集器数量比业务应用进程数量还多的窘况吧）。
+夜莺监控是一款开源云原生观测分析工具，采用 All-in-One 的设计理念，集数据采集、可视化、监控告警、数据分析于一体，与云原生生态紧密集成，提供开箱即用的企业级监控分析和告警能力。夜莺于 2020 年 3 月 20 日，在 GitHub 上发布 v1 版本，已累计迭代 100 多个版本。
 
-夜莺 Nightingale 作为一款开源云原生监控工具，最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。在 GitHub 上有超过 10000 颗星，是广受关注和使用的开源监控工具。夜莺的核心研发团队，也是 Open-Falcon 项目原核心研发人员，从 2014 年（Open-Falcon 是 2014 年开源）算起来，也有 10 年了，只为把监控做到极致。
+夜莺最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。夜莺的核心研发团队，也是 Open-Falcon 项目原核心研发人员，从 2014 年（Open-Falcon 是 2014 年开源）算起来，也有 10 年了，只为把监控这个事情做好。
 
 
 ## 快速开始
 - 👉 [文档中心](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)
 
 ## 功能特点
 
-- 对接多种时序库，实现统一监控告警管理：支持对接的时序库包括 Prometheus、VictoriaMetrics、Thanos、Mimir、M3DB、TDengine 等。
-- 对接日志库，实现针对日志的监控告警：支持对接的日志库包括 ElasticSearch、Loki 等。
+- 对接多种时序库：支持对接 Prometheus、VictoriaMetrics、Thanos、Mimir、M3DB、TDengine 等多种时序库，实现统一告警管理。
 - 专业告警能力：内置支持多种告警规则，可以扩展支持常见通知媒介，支持告警屏蔽/抑制/订阅/自愈、告警事件管理。
 - 高性能可视化引擎：支持多种图表样式，内置众多 Dashboard 模版，也可导入 Grafana 模版，开箱即用，开源协议商业友好。
 - 支持常见采集器：支持 [Categraf](https://flashcat.cloud/product/categraf)、Telegraf、Grafana-agent、Datadog-agent、各种 Exporter 作为采集器，没有什么数据是不能监控的。
@@ -59,23 +53,23 @@
 
 你可以在页面的右上角，切换语言和主题，目前我们支持英语、简体中文、繁体中文。
 
-![语言切换](doc/img/readme/n9e-switch-i18n.png)
+![语言切换](https://download.flashcat.cloud/ulric/n9e-switch-i18n.png)
 
 即时查询，类似 Prometheus 内置的查询分析页面，做 ad-hoc 查询，夜莺做了一些 UI 优化，同时提供了一些内置 promql 指标，让不太了解 promql 的用户也可以快速查询。
 
-![即时查询](doc/img/readme/20240513103305.png)
+![即时查询](https://download.flashcat.cloud/ulric/20240513103305.png)
 
 当然，也可以直接通过指标视图查看，有了指标视图，即时查询基本可以不用了，或者只有高端玩家使用即时查询，普通用户直接通过指标视图查询即可。
 
-![指标视图](doc/img/readme/20240513103530.png)
+![指标视图](https://download.flashcat.cloud/ulric/20240513103530.png)
 
 夜莺内置了常用仪表盘，可以直接导入使用。也可以导入 Grafana 仪表盘，不过只能兼容 Grafana 基本图表，如果已经习惯了 Grafana 建议继续使用 Grafana 看图，把夜莺作为一个告警引擎使用。
 
-![内置仪表盘](doc/img/readme/20240513103628.png)
+![内置仪表盘](https://download.flashcat.cloud/ulric/20240513103628.png)
 
 除了内置的仪表盘，也内置了很多告警规则，开箱即用。
 
-![内置告警规则](doc/img/readme/20240513103825.png)
+![内置告警规则](https://download.flashcat.cloud/ulric/20240513103825.png)
 
 
 
@@ -83,17 +77,20 @@
 
 社区使用夜莺最多的场景就是使用夜莺做告警引擎，对接多套时序库，统一告警规则管理。绘图仍然使用 Grafana 居多。作为一个告警引擎，夜莺的产品架构如下：
 
-![产品架构](doc/img/readme/20240221152601.png)
+![产品架构](https://download.flashcat.cloud/ulric/20240221152601.png)
 
 对于个别边缘机房，如果和中心夜莺服务端网络链路不好，希望提升告警可用性，我们也提供边缘机房告警引擎下沉部署模式，这个模式下，即便网络割裂，告警功能也不受影响。
 
-![边缘部署模式](doc/img/readme/20240222102119.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/)，了解更多信息
-- 加我微信：`picobyte`（我已关闭好友验证）拉入微信群，备注：`夜莺互助群`
+- 推荐搜索关注夜莺公众号，第一时间获取社区动态：`夜莺监控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)

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,13 @@ 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,33 +92,27 @@ 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)
 
 	writers := writer.NewWriters(pushgwc)
-	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats, datasourceCache)
+	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats)
 
 	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, targetsOfAlertRulesCache,
-		busiGroupCache, alertMuteCache, datasourceCache, promClients, naming, ctx, alertStats)
+		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)
 
-	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, 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 {
@@ -42,7 +38,7 @@ func NewSyncStats() *Stats {
 		Subsystem: subsystem,
 		Name:      "rule_eval_error_total",
 		Help:      "Number of rule eval error.",
-	}, []string{"datasource", "stage", "busi_group", "rule_id"})
+	}, []string{"datasource", "stage"})
 
 	CounterQueryDataErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,
@@ -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/common/conv.go

@@ -1,35 +1,26 @@
-package models
+package common
 
 import (
 	"fmt"
 	"math"
 	"strings"
 
-	"github.com/ccfos/nightingale/v6/pkg/unit"
+	"github.com/ccfos/nightingale/v6/models"
 	"github.com/prometheus/common/model"
 )
 
 type AnomalyPoint struct {
-	Key           string                         `json:"key"`
-	Labels        model.Metric                   `json:"labels"`
-	Timestamp     int64                          `json:"timestamp"`
-	Value         float64                        `json:"value"`
-	Severity      int                            `json:"severity"`
-	Triggered     bool                           `json:"triggered"`
-	Query         string                         `json:"query"`
-	Values        string                         `json:"values"`
-	ValuesUnit    map[string]unit.FormattedValue `json:"values_unit"`
-	RecoverConfig RecoverConfig                  `json:"recover_config"`
-	TriggerType   TriggerType                    `json:"trigger_type"`
+	Key           string               `json:"key"`
+	Labels        model.Metric         `json:"labels"`
+	Timestamp     int64                `json:"timestamp"`
+	Value         float64              `json:"value"`
+	Severity      int                  `json:"severity"`
+	Triggered     bool                 `json:"triggered"`
+	Query         string               `json:"query"`
+	Values        string               `json:"values"`
+	RecoverConfig models.RecoverConfig `json:"recover_config"`
 }
 
-type TriggerType string
-
-const (
-	TriggerTypeNormal TriggerType = "normal"
-	TriggerTypeNodata TriggerType = "nodata"
-)
-
 func NewAnomalyPoint(key string, labels map[string]string, ts int64, value float64, severity int) AnomalyPoint {
 	anomalyPointLabels := make(model.Metric)
 	for k, v := range labels {

alert/dispatch/consume.go

@@ -1,7 +1,6 @@
 package dispatch
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -14,10 +13,8 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
 	"github.com/ccfos/nightingale/v6/prom"
 
-	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/concurrent/semaphore"
 	"github.com/toolkits/pkg/logger"
 )
@@ -30,18 +27,6 @@ type Consumer struct {
 	promClients *prom.PromClientMap
 }
 
-func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
-	tplx.RegisterQueryFunc(func(datasourceID int64, promql string) model.Value {
-		if promClients.IsNil(datasourceID) {
-			return nil
-		}
-
-		readerClient := promClients.GetCli(datasourceID)
-		value, _, _ := readerClient.Query(context.Background(), promql, time.Now())
-		return value
-	})
-}
-
 // 创建一个 Consumer 实例
 func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap) *Consumer {
 	return &Consumer{
@@ -128,7 +113,7 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 		event.Id, err = poster.PostByUrlsWithResp[int64](e.ctx, "/v1/n9e/event-persist", event)
 		if err != nil {
 			logger.Errorf("event:%+v persist err:%v", event, err)
-			e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
+			e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event").Inc()
 		}
 		return
 	}
@@ -136,7 +121,7 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 	err := models.EventPersist(e.ctx, event)
 	if err != nil {
 		logger.Errorf("event%+v persist err:%v", event, err)
-		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
+		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event").Inc()
 	}
 }
 
@@ -184,7 +169,7 @@ func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
 		logger.Errorf("rule_eval:%s promql:%s, warnings:%v", getKey(event), promql, warnings)
 	}
 
-	anomalyPoints := models.ConvertAnomalyPoints(value)
+	anomalyPoints := common.ConvertAnomalyPoints(value)
 	if len(anomalyPoints) == 0 {
 		logger.Warningf("rule_eval:%s promql:%s, result is empty", getKey(event), promql)
 		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%s", promql, "result is empty")

alert/dispatch/dispatch.go

@@ -3,8 +3,6 @@ package dispatch
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"html/template"
 	"net/url"
 	"strconv"
@@ -32,10 +30,6 @@ type Dispatch struct {
 	notifyConfigCache   *memsto.NotifyConfigCacheType
 	taskTplsCache       *memsto.TaskTplCache
 
-	notifyRuleCache      *memsto.NotifyRuleCacheType
-	notifyChannelCache   *memsto.NotifyChannelCacheType
-	messageTemplateCache *memsto.MessageTemplateCacheType
-
 	alerting aconf.Alerting
 
 	Senders          map[string]sender.Sender
@@ -53,19 +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, 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,
+		alertRuleCache:      alertRuleCache,
+		userCache:           userCache,
+		userGroupCache:      userGroupCache,
+		alertSubscribeCache: alertSubscribeCache,
+		targetCache:         targetCache,
+		notifyConfigCache:   notifyConfigCache,
+		taskTplsCache:       taskTplsCache,
 
 		alerting: alerting,
 
@@ -81,7 +71,7 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 }
 
 func (e *Dispatch) ReloadTpls() error {
-	err := e.reloadTpls()
+	err := e.relaodTpls()
 	if err != nil {
 		logger.Errorf("failed to reload tpls: %v", err)
 	}
@@ -89,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
@@ -141,272 +131,6 @@ func (e *Dispatch) reloadTpls() error {
 	return nil
 }
 
-func (e *Dispatch) HandleEventWithNotifyRule(event *models.AlertCurEvent, isSubscribe bool) {
-
-	if len(event.NotifyRuleIDs) > 0 {
-		for _, notifyRuleId := range event.NotifyRuleIDs {
-			logger.Infof("notify rule ids: %v, event: %+v", notifyRuleId, event)
-			notifyRule := e.notifyRuleCache.Get(notifyRuleId)
-			if notifyRule == nil {
-				continue
-			}
-
-			if !notifyRule.Enable {
-				continue
-			}
-
-			for i := range notifyRule.NotifyConfigs {
-				if !NotifyRuleApplicable(&notifyRule.NotifyConfigs[i], event) {
-					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{event}, 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, event, 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, event, notifyRule.NotifyConfigs[i].TemplateID)
-					sender.NotifyRecord(e.ctx, []*models.AlertCurEvent{event}, notifyRuleId, notifyChannel.Name, "", "", errors.New("message_template not found"))
-
-					continue
-				}
-
-				// todo go send
-				// todo 聚合 event
-				go e.sendV2([]*models.AlertCurEvent{event}, notifyRuleId, &notifyRule.NotifyConfigs[i], notifyChannel, messageTemplate)
-			}
-		}
-	}
-}
-
-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":
-		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的配置产生
@@ -415,12 +139,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	if rule == nil {
 		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 (
@@ -449,7 +167,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}
 
 	// 处理事件发送,这里用一个goroutine处理一个event的所有发送事件
-	go e.HandleEventWithNotifyRule(event, isSubscribe)
 	go e.Send(rule, event, notifyTarget, isSubscribe)
 
 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
@@ -458,25 +175,6 @@ 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)
@@ -568,12 +266,10 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 	e.SendCallbacks(rule, notifyTarget, event)
 
 	// handle global webhooks
-	if !event.OverrideGlobalWebhook() {
-		if e.alerting.WebhookBatchSend {
-			sender.BatchSendWebhooks(e.ctx, notifyTarget.ToWebhookMap(), event, e.Astats)
-		} else {
-			sender.SingleSendWebhooks(e.ctx, notifyTarget.ToWebhookMap(), event, e.Astats)
-		}
+	if e.alerting.WebhookBatchSend {
+		sender.BatchSendWebhooks(e.ctx, notifyTarget.ToWebhookList(), event, e.Astats)
+	} else {
+		sender.SingleSendWebhooks(e.ctx, notifyTarget.ToWebhookList(), event, e.Astats)
 	}
 
 	// handle plugin call
@@ -587,10 +283,10 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 }
 
 func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTarget, event *models.AlertCurEvent) {
+
 	uids := notifyTarget.ToUidList()
 	urls := notifyTarget.ToCallbackList()
 	whMap := notifyTarget.ToWebhookMap()
-	ogw := event.OverrideGlobalWebhook()
 	for _, urlStr := range urls {
 		if len(urlStr) == 0 {
 			continue
@@ -598,7 +294,7 @@ func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTar
 
 		cbCtx := sender.BuildCallBackContext(e.ctx, urlStr, rule, []*models.AlertCurEvent{event}, uids, e.userCache, e.alerting.WebhookBatchSend, e.Astats)
 
-		if wh, ok := whMap[cbCtx.CallBackURL]; !ogw && ok && wh.Enable {
+		if wh, ok := whMap[cbCtx.CallBackURL]; ok && wh.Enable {
 			logger.Debugf("SendCallbacks: webhook[%s] is in global conf.", cbCtx.CallBackURL)
 			continue
 		}
@@ -724,22 +420,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/dispatch/notify_target.go

@@ -76,8 +76,52 @@ func (s *NotifyTarget) ToCallbackList() []string {
 	return callbacks
 }
 
+func (s *NotifyTarget) ToWebhookList() []*models.Webhook {
+	webhooks := make([]*models.Webhook, 0, len(s.webhooks))
+	for _, wh := range s.webhooks {
+		if wh.Batch == 0 {
+			wh.Batch = 1000
+		}
+
+		if wh.Timeout == 0 {
+			wh.Timeout = 10
+		}
+
+		if wh.RetryCount == 0 {
+			wh.RetryCount = 10
+		}
+
+		if wh.RetryInterval == 0 {
+			wh.RetryInterval = 10
+		}
+
+		webhooks = append(webhooks, wh)
+	}
+	return webhooks
+}
+
 func (s *NotifyTarget) ToWebhookMap() map[string]*models.Webhook {
-	return s.webhooks
+	webhookMap := make(map[string]*models.Webhook, len(s.webhooks))
+	for _, wh := range s.webhooks {
+		if wh.Batch == 0 {
+			wh.Batch = 1000
+		}
+
+		if wh.Timeout == 0 {
+			wh.Timeout = 10
+		}
+
+		if wh.RetryCount == 0 {
+			wh.RetryCount = 10
+		}
+
+		if wh.RetryInterval == 0 {
+			wh.RetryInterval = 10
+		}
+
+		webhookMap[wh.Url] = wh
+	}
+	return webhookMap
 }
 
 func (s *NotifyTarget) ToUidList() []int64 {

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,8 +95,9 @@ func (s *Scheduler) syncAlertRules() {
 		}
 
 		ruleType := rule.GetRuleType()
-		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() || rule.IsClickHouseRule() || rule.IsElasticSearch() {
-			datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
+		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() {
+			datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
+			datasourceIds = append(datasourceIds, s.tdengineClients.Hit(rule.DatasourceIdsJson)...)
 			for _, dsId := range datasourceIds {
 				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 					continue
@@ -116,7 +119,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,13 +128,12 @@ 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
 			// if rule is not processed by prometheus engine, create it as externalRule
-			dsIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
-			for _, dsId := range dsIds {
+			for _, dsId := range rule.DatasourceIdsJson {
 				ds := s.datasourceCache.GetById(dsId)
 				if ds == nil {
 					logger.Debugf("datasource %d not found", dsId)
@@ -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/eval/eval_test.go

@@ -269,190 +269,3 @@ func allValueDeepEqual(got, want map[uint64][]uint64) bool {
 	}
 	return true
 }
-
-// allValueDeepEqualOmitOrder 判断两个字符串切片是否相等，不考虑顺序
-func allValueDeepEqualOmitOrder(got, want []string) bool {
-	if len(got) != len(want) {
-		return false
-	}
-	slices.Sort(got)
-	slices.Sort(want)
-	for i := range got {
-		if got[i] != want[i] {
-			return false
-		}
-	}
-	return true
-}
-
-func Test_removeVal(t *testing.T) {
-	type args struct {
-		promql string
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		// TODO: Add test cases.
-		{
-			name: "removeVal1",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"$test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{} > $val",
-		},
-		{
-			name: "removeVal2",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"$test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\"} > $val",
-		},
-		{
-			name: "removeVal3",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{test2=\"test2\"} > $val",
-		},
-		{
-			name: "removeVal4",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"$test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal5",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test2=\"test2\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal6",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"$test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal7",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\",test3='$test3'} > $val",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\"} > $val",
-		},
-		{
-			name: "removeVal8",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal9",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal10",
-			args: args{
-				promql: "mem{test1=\"test1\",test2='$test2'} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test1=\"test1\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal11",
-			args: args{
-				promql: "mem{test1='test1',test2=\"test2\"} > $val1 and mem{test3=\"$test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test1='test1',test2=\"test2\"} > $val1 and mem{test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal12",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"$test4\"} > $val2",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\"} > $val2",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := removeVal(tt.args.promql); got != tt.want {
-				t.Errorf("removeVal() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestExtractVarMapping(t *testing.T) {
-	tests := []struct {
-		name   string
-		promql string
-		want   map[string]string
-	}{
-		{
-			name:   "单个花括号单个变量",
-			promql: `mem_used_percent{host="$my_host"} > $val`,
-			want:   map[string]string{"my_host": "host"},
-		},
-		{
-			name:   "单个花括号多个变量",
-			promql: `mem_used_percent{host="$my_host",region="$region",env="prod"} > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "多个花括号多个变量",
-			promql: `sum(rate(mem_used_percent{host="$my_host"})) by (instance) + avg(node_load1{region="$region"}) > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "相同变量出现多次",
-			promql: `sum(rate(mem_used_percent{host="$my_host"})) + avg(node_load1{host="$my_host"}) > $val`,
-			want:   map[string]string{"my_host": "host"},
-		},
-		{
-			name:   "没有变量",
-			promql: `mem_used_percent{host="localhost",region="cn"} > 80`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "没有花括号",
-			promql: `80 > $val`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "格式不规范的标签",
-			promql: `mem_used_percent{host=$my_host,region = $region} > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "空花括号",
-			promql: `mem_used_percent{} > $val`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "不完整的花括号",
-			promql: `mem_used_percent{host="$my_host"`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "复杂表达式",
-			promql: `sum(rate(http_requests_total{handler="$handler",code="$code"}[5m])) by (handler) / sum(rate(http_requests_total{handler="$handler"}[5m])) by (handler) * 100 > $threshold`,
-			want:   map[string]string{"handler": "handler", "code": "code"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ExtractVarMapping(tt.promql)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ExtractVarMapping() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

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
@@ -122,19 +121,19 @@ 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
+			return true
 		}
 	}
 
-	return false, 0
+	return false
 }
 
 // matchMute 如果传入了clock这个可选参数，就表示使用这个clock表示的时间，否则就从event的字段中取TriggerTime

alert/process/process.go

@@ -2,7 +2,6 @@ package process
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"html/template"
 	"sort"
@@ -22,7 +21,6 @@ import (
 	"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"
 )
@@ -80,9 +78,6 @@ type Processor struct {
 	HandleFireEventHook    HandleEventFunc
 	HandleRecoverEventHook HandleEventFunc
 	EventMuteHook          EventMuteHookFunc
-
-	ScheduleEntry    cron.Entry
-	PromEvalInterval int
 }
 
 func (p *Processor) Key() string {
@@ -94,9 +89,9 @@ func (p *Processor) DatasourceId() int64 {
 }
 
 func (p *Processor) Hash() string {
-	return str.MD5(fmt.Sprintf("%d_%s_%s_%d",
+	return str.MD5(fmt.Sprintf("%d_%d_%s_%d",
 		p.rule.Id,
-		p.rule.CronPattern,
+		p.rule.PromEvalInterval,
 		p.rule.RuleConfig,
 		p.datasourceId,
 	))
@@ -131,7 +126,7 @@ func NewProcessor(engineName string, rule *models.AlertRule, datasourceId int64,
 	return p
 }
 
-func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inhibit bool) {
+func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inhibit bool) {
 	// 有可能rule的一些配置已经发生变化，比如告警接收人、callbacks等
 	// 这些信息的修改是不会引起worker restart的，但是确实会影响告警处理逻辑
 	// 所以，这里直接从memsto.AlertRuleCache中获取并覆盖
@@ -139,13 +134,10 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	cachedRule := p.alertRuleCache.Get(p.rule.Id)
 	if cachedRule == nil {
 		logger.Errorf("rule not found %+v", anomalyPoints)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
+		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event").Inc()
 		return
 	}
 
-	// 在 rule 变化之前取到 ruleHash
-	ruleHash := p.rule.Hash()
-
 	p.rule = cachedRule
 	now := time.Now().Unix()
 	alertingKeys := map[string]struct{}{}
@@ -153,31 +145,20 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	// 根据 event 的 tag 将 events 分组，处理告警抑制的情况
 	eventsMap := make(map[string][]*models.AlertCurEvent)
 	for _, anomalyPoint := range anomalyPoints {
-		event := p.BuildEvent(anomalyPoint, from, now, ruleHash)
-		event.NotifyRuleIDs = cachedRule.NotifyRuleIds
+		event := p.BuildEvent(anomalyPoint, from, now)
 		// 如果 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
 		}
 
@@ -194,7 +175,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 {
+func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, now int64) *models.AlertCurEvent {
 	p.fillTags(anomalyPoint)
 	p.mayHandleIdent()
 	hash := Hash(p.rule.Id, p.datasourceId, anomalyPoint)
@@ -220,38 +201,22 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.TargetNote = p.targetNote
 	event.TriggerValue = anomalyPoint.ReadableValue()
 	event.TriggerValues = anomalyPoint.Values
-	event.TriggerValuesJson = models.EventTriggerValues{ValuesWithUnit: anomalyPoint.ValuesUnit}
 	event.TagsJSON = p.tagsArr
 	event.Tags = strings.Join(p.tagsArr, ",,")
 	event.IsRecovered = false
 	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
 	event.ExtraConfig = p.rule.ExtraConfigJSON
 	event.PromQl = anomalyPoint.Query
 	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)
@@ -449,7 +414,6 @@ func (p *Processor) handleEvent(events []*models.AlertCurEvent) {
 			p.pendingsUseByRecover.Set(event.Hash, event)
 		}
 
-		event.PromEvalInterval = p.PromEvalInterval
 		if p.rule.PromForDuration == 0 {
 			fireEvents = append(fireEvents, event)
 			if severity > event.Severity {
@@ -544,7 +508,7 @@ func (p *Processor) pushEventToQueue(e *models.AlertCurEvent) {
 	dispatch.LogEvent(e, "push_queue")
 	if !queue.EventQueue.PushFront(e) {
 		logger.Warningf("event_push_queue: queue is full, event:%+v", e)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "push_event_queue", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
+		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "push_event_queue").Inc()
 	}
 }
 
@@ -555,7 +519,7 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(p.ctx, p.rule.Id, p.datasourceId)
 	if err != nil {
 		logger.Errorf("recover event from db for rule:%s failed, err:%s", p.Key(), err)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "get_recover_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
+		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "get_recover_event").Inc()
 		p.fires = NewAlertCurEventMap(nil)
 		return
 	}
@@ -563,12 +527,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 == "") {
@@ -580,7 +538,6 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 		event.DB2Mem()
 		target, exists := p.TargetCache.Get(event.TargetIdent)
 		if exists {
-			target.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(target.GroupIds)
 			event.Target = target
 		}
 
@@ -595,7 +552,7 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	p.pendingsUseByRecover = NewAlertCurEventMap(pendingsUseByRecoverMap)
 }
 
-func (p *Processor) fillTags(anomalyPoint models.AnomalyPoint) {
+func (p *Processor) fillTags(anomalyPoint common.AnomalyPoint) {
 	// handle series tags
 	tagsMap := make(map[string]string)
 	for label, value := range anomalyPoint.Labels {
@@ -685,10 +642,10 @@ func labelMapToArr(m map[string]string) []string {
 	return labelStrings
 }
 
-func Hash(ruleId, datasourceId int64, vector models.AnomalyPoint) string {
+func Hash(ruleId, datasourceId int64, vector common.AnomalyPoint) string {
 	return str.MD5(fmt.Sprintf("%d_%s_%d_%d_%s", ruleId, vector.Labels.String(), datasourceId, vector.Severity, vector.Query))
 }
 
-func TagHash(vector models.AnomalyPoint) string {
+func TagHash(vector common.AnomalyPoint) string {
 	return str.MD5(vector.Labels.String())
 }

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()
 	})

alert/record/scheduler.go

@@ -26,11 +26,9 @@ type Scheduler struct {
 	writers     *writer.WritersType
 
 	stats *astats.Stats
-
-	datasourceCache *memsto.DatasourceCacheType
 }
 
-func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats, datasourceCache *memsto.DatasourceCacheType) *Scheduler {
+func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats) *Scheduler {
 	scheduler := &Scheduler{
 		aconf:       aconf,
 		recordRules: make(map[string]*RecordRuleContext),
@@ -41,8 +39,6 @@ func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promCli
 		writers:     writers,
 
 		stats: stats,
-
-		datasourceCache: datasourceCache,
 	}
 
 	go scheduler.LoopSyncRules(context.Background())
@@ -71,7 +67,7 @@ func (s *Scheduler) syncRecordRules() {
 			continue
 		}
 
-		datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries("prometheus", rule.DatasourceQueries)
+		datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
 		for _, dsId := range datasourceIds {
 			if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 				continue

alert/router/router_event.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"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/naming"
@@ -40,8 +41,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
@@ -91,7 +92,7 @@ func (rt *Router) eventPersist(c *gin.Context) {
 
 type eventForm struct {
 	Alert         bool                  `json:"alert"`
-	AnomalyPoints []models.AnomalyPoint `json:"vectors"`
+	AnomalyPoints []common.AnomalyPoint `json:"vectors"`
 	RuleId        int64                 `json:"rule_id"`
 	DatasourceId  int64                 `json:"datasource_id"`
 	Inhibit       bool                  `json:"inhibit"`

alert/sender/callback.go

@@ -129,38 +129,44 @@ func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
 		return
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, event, "callback", ctx.Stats, ctx.Events)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+	resp, code, err := poster.PostJSON(ctx.CallBackURL, 5*time.Second, event, 3)
+	if err != nil {
+		logger.Errorf("event_callback_fail(rule_id=%d url=%s), event:%+v, resp: %s, err: %v, code: %d",
+			event.RuleId, ctx.CallBackURL, event, string(resp), err, code)
+		ctx.Stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
+	} else {
+		logger.Infof("event_callback_succ(rule_id=%d url=%s), event:%+v, resp: %s, code: %d",
+			event.RuleId, ctx.CallBackURL, event, string(resp), code)
+	}
 }
 
 func doSendAndRecord(ctx *ctx.Context, url, token string, body interface{}, channel string,
-	stats *astats.Stats, events []*models.AlertCurEvent) {
+	stats *astats.Stats, event *models.AlertCurEvent) {
 	res, err := doSend(url, body, channel, stats)
-	NotifyRecord(ctx, events, 0, channel, token, res, err)
+	NotifyRecord(ctx, event, channel, token, res, err)
 }
 
-func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, notifyRuleID int64, 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)
-		if err != nil {
-			noti.SetStatus(models.NotiStatusFailure)
-			noti.SetDetails(err.Error())
-		} else if res != "" {
-			noti.SetDetails(string(res))
-		}
-		notis = append(notis, noti)
+func NotifyRecord(ctx *ctx.Context, evt *models.AlertCurEvent, channel, target, res string, err error) {
+	noti := models.NewNotificationRecord(evt, channel, target)
+	if err != nil {
+		noti.SetStatus(models.NotiStatusFailure)
+		noti.SetDetails(err.Error())
+	} else if res != "" {
+		noti.SetDetails(string(res))
 	}
 
 	if !ctx.IsCenter {
-		err := poster.PostByUrls(ctx, "/v1/n9e/notify-record", notis)
+		_, err := poster.PostByUrlsWithResp[int64](ctx, "/v1/n9e/notify-record", noti)
 		if err != nil {
-			logger.Errorf("add notis:%v failed, err: %v", notis, err)
+			logger.Errorf("add noti:%v failed, err: %v", noti, err)
 		}
 		return
 	}
 
-	PushNotifyRecords(notis)
+	if err := noti.Add(ctx); err != nil {
+		logger.Errorf("add noti:%v failed, err: %v", noti, err)
+	}
 }
 
 func doSend(url string, body interface{}, channel string, stats *astats.Stats) (string, error) {
@@ -189,8 +195,8 @@ func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.
 
 	if queue == nil {
 		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
+			list:    NewSafeListLimited(QueueMaxSize),
+			closeCh: make(chan struct{}),
 		}
 
 		CallbackEventQueueLock.Lock()
@@ -200,8 +206,8 @@ func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.
 		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
 	}
 
-	succ := queue.eventQueue.Push(event)
+	succ := queue.list.PushFront(event)
 	if !succ {
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
 	}
 }

alert/sender/dingtalk.go

@@ -67,7 +67,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 			}
 		}
 
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Dingtalk, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Dingtalk, ctx.Stats, ctx.Events[0])
 	}
 }
 
@@ -97,7 +97,10 @@ func (ds *DingtalkSender) CallBack(ctx CallBackContext) {
 		body.Markdown.Text = message
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body,
+		"callback", ctx.Stats, ctx.Events[0])
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 // extract urls and ats from Users

alert/sender/email.go

@@ -25,8 +25,8 @@ type EmailSender struct {
 }
 
 type EmailContext struct {
-	events []*models.AlertCurEvent
-	mail   *gomail.Message
+	event *models.AlertCurEvent
+	mail  *gomail.Message
 }
 
 func (es *EmailSender) Send(ctx MessageContext) {
@@ -42,7 +42,7 @@ func (es *EmailSender) Send(ctx MessageContext) {
 		subject = ctx.Events[0].RuleName
 	}
 	content := BuildTplMessage(models.Email, es.contentTpl, ctx.Events)
-	es.WriteEmail(subject, content, tos, ctx.Events)
+	es.WriteEmail(subject, content, tos, ctx.Events[0])
 
 	ctx.Stats.AlertNotifyTotal.WithLabelValues(models.Email).Add(float64(len(tos)))
 }
@@ -79,7 +79,8 @@ func SendEmail(subject, content string, tos []string, stmp aconf.SMTPConfig) err
 	return nil
 }
 
-func (es *EmailSender) WriteEmail(subject, content string, tos []string, events []*models.AlertCurEvent) {
+func (es *EmailSender) WriteEmail(subject, content string, tos []string,
+	event *models.AlertCurEvent) {
 	m := gomail.NewMessage()
 
 	m.SetHeader("From", es.smtp.From)
@@ -87,7 +88,7 @@ func (es *EmailSender) WriteEmail(subject, content string, tos []string, events
 	m.SetHeader("Subject", subject)
 	m.SetBody("text/html", content)
 
-	mailch <- &EmailContext{events, m}
+	mailch <- &EmailContext{event, m}
 }
 
 func dialSmtp(d *gomail.Dialer) gomail.SendCloser {
@@ -201,11 +202,7 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 			}
 
 			for _, to := range m.mail.GetHeader("To") {
-				msg := ""
-				if err == nil {
-					msg = "ok"
-				}
-				NotifyRecord(ctx, m.events, 0, models.Email, to, msg, err)
+				NotifyRecord(ctx, m.event, models.Email, to, "", err)
 			}
 
 			size++

alert/sender/feishu.go

@@ -54,7 +54,9 @@ func (fs *FeishuSender) CallBack(ctx CallBackContext) {
 		},
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (fs *FeishuSender) Send(ctx MessageContext) {
@@ -76,7 +78,7 @@ func (fs *FeishuSender) Send(ctx MessageContext) {
 				IsAtAll:   false,
 			}
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events[0])
 	}
 }
 

alert/sender/feishucard.go

@@ -135,7 +135,8 @@ func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	}
 	parsedURL.RawQuery = ""
 
-	doSendAndRecord(ctx.Ctx, parsedURL.String(), parsedURL.String(), body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, parsedURL.String(), parsedURL.String(), body, "callback",
+		ctx.Stats, ctx.Events[0])
 }
 
 func (fs *FeishuCardSender) Send(ctx MessageContext) {
@@ -159,7 +160,8 @@ func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
 	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard,
+			ctx.Stats, ctx.Events[0])
 	}
 }
 

alert/sender/ibex.go

@@ -118,7 +118,6 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 	// 附加告警级别  告警触发值标签
 	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
 	tagsMap["alert_trigger_value"] = event.TriggerValue
-	tagsMap["is_recovered"] = strconv.FormatBool(event.IsRecovered)
 
 	tags, err := json.Marshal(tagsMap)
 	if err != nil {

alert/sender/lark.go

@@ -27,29 +27,30 @@ func (lk *LarkSender) CallBack(ctx CallBackContext) {
 		},
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (lk *LarkSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := lk.extract(ctx.Users)
+	urls := lk.extract(ctx.Users)
 	message := BuildTplMessage(models.Lark, lk.tpl, ctx.Events)
-	for i, url := range urls {
+	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
 			Content: feishuContent{
 				Text: message,
 			},
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Lark, ctx.Stats, ctx.Events)
+		doSend(url, body, models.Lark, ctx.Stats)
 	}
 }
 
-func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
+func (lk *LarkSender) extract(users []*models.User) []string {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
 
 	for _, user := range users {
 		if token, has := user.ExtractToken(models.Lark); has {
@@ -58,8 +59,7 @@ func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls
 }

alert/sender/larkcard.go

@@ -56,14 +56,15 @@ func (fs *LarkCardSender) CallBack(ctx CallBackContext) {
 	}
 	parsedURL.RawQuery = ""
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
 }
 
 func (fs *LarkCardSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := fs.extract(ctx.Users)
+	urls, _ := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.LarkCard, fs.tpl, ctx.Events)
 	color := "red"
 	lowerUnicode := strings.ToLower(message)
@@ -79,14 +80,14 @@ func (fs *LarkCardSender) Send(ctx MessageContext) {
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.LarkCard, ctx.Stats, ctx.Events)
+	for _, url := range urls {
+		doSend(url, body, models.LarkCard, ctx.Stats)
 	}
 }
 
 func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0)
+	ats := make([]string, 0)
 	for i := range users {
 		if token, has := users[i].ExtractToken(models.Lark); has {
 			url := token
@@ -94,8 +95,7 @@ func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls, ats
 }

alert/sender/mm.go

@@ -43,7 +43,7 @@ func (ms *MmSender) Send(ctx MessageContext) {
 		Text:   message,
 		Tokens: urls,
 		Stats:  ctx.Stats,
-	}, ctx.Events, models.Mm)
+	}, ctx.Events[0])
 }
 
 func (ms *MmSender) CallBack(ctx CallBackContext) {
@@ -56,7 +56,9 @@ func (ms *MmSender) CallBack(ctx CallBackContext) {
 		Text:   message,
 		Tokens: []string{ctx.CallBackURL},
 		Stats:  ctx.Stats,
-	}, ctx.Events, "callback")
+	}, ctx.Events[0])
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (ms *MmSender) extract(users []*models.User) []string {
@@ -69,12 +71,11 @@ func (ms *MmSender) extract(users []*models.User) []string {
 	return tokens
 }
 
-func SendMM(ctx *ctx.Context, message MatterMostMessage, events []*models.AlertCurEvent, channel string) {
+func SendMM(ctx *ctx.Context, message MatterMostMessage, event *models.AlertCurEvent) {
 	for i := 0; i < len(message.Tokens); i++ {
 		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)
 			continue
 		}
 
@@ -103,7 +104,7 @@ func SendMM(ctx *ctx.Context, message MatterMostMessage, events []*models.AlertC
 				Username: username,
 				Text:     txt + message.Text,
 			}
-			doSendAndRecord(ctx, ur, message.Tokens[i], body, channel, message.Stats, events)
+			doSendAndRecord(ctx, ur, message.Tokens[i], body, models.Mm, message.Stats, event)
 		}
 	}
 }

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, 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

@@ -1,7 +1,6 @@
 package sender
 
 import (
-	"errors"
 	"html/template"
 	"strings"
 
@@ -41,7 +40,9 @@ func (ts *TelegramSender) CallBack(ctx CallBackContext) {
 		Text:   message,
 		Tokens: []string{ctx.CallBackURL},
 		Stats:  ctx.Stats,
-	}, ctx.Events, "callback")
+	}, ctx.Events[0])
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (ts *TelegramSender) Send(ctx MessageContext) {
@@ -55,7 +56,7 @@ func (ts *TelegramSender) Send(ctx MessageContext) {
 		Text:   message,
 		Tokens: tokens,
 		Stats:  ctx.Stats,
-	}, ctx.Events, models.Telegram)
+	}, ctx.Events[0])
 }
 
 func (ts *TelegramSender) extract(users []*models.User) []string {
@@ -68,11 +69,10 @@ func (ts *TelegramSender) extract(users []*models.User) []string {
 	return tokens
 }
 
-func SendTelegram(ctx *ctx.Context, message TelegramMessage, events []*models.AlertCurEvent, channel string) {
+func SendTelegram(ctx *ctx.Context, message TelegramMessage, event *models.AlertCurEvent) {
 	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"))
 			continue
 		}
 		var url string
@@ -93,6 +93,6 @@ func SendTelegram(ctx *ctx.Context, message TelegramMessage, events []*models.Al
 			Text:      message.Text,
 		}
 
-		doSendAndRecord(ctx, url, message.Tokens[i], body, channel, message.Stats, events)
+		doSendAndRecord(ctx, url, message.Tokens[i], body, models.Telegram, message.Stats, event)
 	}
 }

alert/sender/webhook.go

@@ -59,21 +59,17 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 	if webhook != nil {
 		insecureSkipVerify = webhook.SkipVerify
 	}
-
-	if conf.Client == nil {
-		logger.Warningf("event_%s, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, "client is nil")
-		conf.Client = &http.Client{
-			Timeout: time.Duration(conf.Timeout) * time.Second,
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
-			},
-		}
+	client := http.Client{
+		Timeout: time.Duration(conf.Timeout) * time.Second,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
+		},
 	}
 
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
 	var resp *http.Response
 	var body []byte
-	resp, err = conf.Client.Do(req)
+	resp, err = client.Do(req)
 
 	if err != nil {
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
@@ -95,12 +91,12 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 	return false, string(body), nil
 }
 
-func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func SingleSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		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, event, "webhook", conf.Url, res, err)
 			if !needRetry {
 				break
 			}
@@ -110,7 +106,7 @@ func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, e
 	}
 }
 
-func BatchSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func BatchSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		logger.Infof("push event:%+v to queue:%v", event, conf)
 		PushEvent(ctx, conf, event, stats)
@@ -125,8 +121,8 @@ var EventQueueLock sync.RWMutex
 const QueueMaxSize = 100000
 
 type WebhookQueue struct {
-	eventQueue *SafeEventQueue
-	closeCh    chan struct{}
+	list    *SafeListLimited
+	closeCh chan struct{}
 }
 
 func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
@@ -136,8 +132,8 @@ func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCur
 
 	if queue == nil {
 		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
+			list:    NewSafeListLimited(QueueMaxSize),
+			closeCh: make(chan struct{}),
 		}
 
 		EventQueueLock.Lock()
@@ -147,10 +143,10 @@ func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCur
 		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
 	}
 
-	succ := queue.eventQueue.Push(event)
+	succ := queue.list.PushFront(event)
 	if !succ {
 		stats.AlertNotifyErrorTotal.WithLabelValues("push_event_queue").Inc()
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
 	}
 }
 
@@ -161,7 +157,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 			logger.Infof("event queue:%v closed", queue)
 			return
 		default:
-			events := queue.eventQueue.PopN(popSize)
+			events := queue.list.PopBack(popSize)
 			if len(events) == 0 {
 				time.Sleep(time.Millisecond * 400)
 				continue
@@ -170,7 +166,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 RecordEvents(ctx, webhook, events, stats, res, err)
 				if !needRetry {
 					break
 				}
@@ -180,3 +176,10 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 		}
 	}
 }
+
+func RecordEvents(ctx *ctx.Context, webhook *models.Webhook, events []*models.AlertCurEvent, stats *astats.Stats, res string, err error) {
+	for _, event := range events {
+		time.Sleep(time.Millisecond * 10)
+		NotifyRecord(ctx, event, "webhook", webhook.Url, res, err)
+	}
+}

alert/sender/webhook_event_queue.go

@@ -1,109 +0,0 @@
-package sender
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type SafeEventQueue struct {
-	lock        sync.RWMutex
-	maxSize     int
-	queueHigh   *list.List
-	queueMiddle *list.List
-	queueLow    *list.List
-}
-
-const (
-	High   = 1
-	Middle = 2
-	Low    = 3
-)
-
-func NewSafeEventQueue(maxSize int) *SafeEventQueue {
-	return &SafeEventQueue{
-		maxSize:     maxSize,
-		lock:        sync.RWMutex{},
-		queueHigh:   list.New(),
-		queueMiddle: list.New(),
-		queueLow:    list.New(),
-	}
-}
-
-func (spq *SafeEventQueue) Len() int {
-	spq.lock.RLock()
-	defer spq.lock.RUnlock()
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-// len 无锁读取长度，不要在本文件外调用
-func (spq *SafeEventQueue) len() int {
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-func (spq *SafeEventQueue) Push(event *models.AlertCurEvent) bool {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	for spq.len() > spq.maxSize {
-		return false
-	}
-
-	switch event.Severity {
-	case High:
-		spq.queueHigh.PushBack(event)
-	case Middle:
-		spq.queueMiddle.PushBack(event)
-	case Low:
-		spq.queueLow.PushBack(event)
-	default:
-		return false
-	}
-
-	return true
-}
-
-// pop 无锁弹出事件，不要在本文件外调用
-func (spq *SafeEventQueue) pop() *models.AlertCurEvent {
-	if spq.len() == 0 {
-		return nil
-	}
-
-	var elem interface{}
-
-	if spq.queueHigh.Len() > 0 {
-		elem = spq.queueHigh.Remove(spq.queueHigh.Front())
-	} else if spq.queueMiddle.Len() > 0 {
-		elem = spq.queueMiddle.Remove(spq.queueMiddle.Front())
-	} else {
-		elem = spq.queueLow.Remove(spq.queueLow.Front())
-	}
-	event, ok := elem.(*models.AlertCurEvent)
-	if !ok {
-		return nil
-	}
-	return event
-}
-
-func (spq *SafeEventQueue) Pop() *models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-	return spq.pop()
-}
-
-func (spq *SafeEventQueue) PopN(n int) []*models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	events := make([]*models.AlertCurEvent, 0, n)
-	count := 0
-	for count < n && spq.len() > 0 {
-		event := spq.pop()
-		if event != nil {
-			events = append(events, event)
-		}
-		count++
-	}
-	return events
-}

alert/sender/webhook_event_queue_test.go

@@ -1,157 +0,0 @@
-package sender
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSafePriorityQueue_ConcurrentPushPop(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 100
-	numEvents := 1000
-
-	// 并发 Push
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1,
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 并发 Pop
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			for {
-				event := spq.Pop()
-				if event == nil {
-					return
-				}
-			}
-		}()
-	}
-	wg.Wait()
-
-	// 最终队列应该为空
-	assert.Equal(t, 0, spq.Len(), "Queue should be empty after concurrent pops")
-}
-
-func TestSafePriorityQueue_ConcurrentPopMax(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	// 添加初始数据
-	for i := 0; i < 1000; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i%3 + 1,
-			TriggerTime: time.Now().UnixNano(),
-		})
-	}
-
-	var wg sync.WaitGroup
-	numGoroutines := 10
-	popMax := 100
-
-	// 并发 PopN
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			events := spq.PopN(popMax)
-			assert.LessOrEqual(t, len(events), popMax, "PopN exceeded maximum")
-		}()
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedRemaining := 1000 - (numGoroutines * popMax)
-	if expectedRemaining < 0 {
-		expectedRemaining = 0
-	}
-	assert.Equal(t, expectedRemaining, spq.Len(), "Queue length mismatch after concurrent PopN")
-}
-
-func TestSafePriorityQueue_ConcurrentPushPopWithDifferentSeverities(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 50
-	numEvents := 500
-
-	// 并发 Push 不同优先级的事件
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1, // 模拟不同的 Severity
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 检查事件的顺序是否按照优先级排列
-	var lastEvent *models.AlertCurEvent
-	for spq.Len() > 0 {
-		event := spq.Pop()
-		if lastEvent != nil {
-			assert.LessOrEqual(t, lastEvent.Severity, event.Severity, "Events are not in correct priority order")
-		}
-		lastEvent = event
-	}
-}
-
-func TestSafePriorityQueue_ExceedMaxSize(t *testing.T) {
-	spq := NewSafeEventQueue(5)
-
-	// 插入超过最大容量的事件
-	for i := 0; i < 10; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i % 3,
-			TriggerTime: int64(i),
-		})
-	}
-
-	// 验证队列的长度是否不超过 maxSize
-	assert.LessOrEqual(t, spq.Len(), spq.maxSize)
-
-	// 验证队列中剩余事件的内容
-	expectedEvents := 5
-	if spq.Len() < 5 {
-		expectedEvents = spq.Len()
-	}
-
-	// 检查最后存入的事件是否是按优先级排序
-	for i := 0; i < expectedEvents; i++ {
-		event := spq.Pop()
-		if event != nil {
-			assert.LessOrEqual(t, event.Severity, 2)
-		}
-	}
-}

alert/sender/wecom.go

@@ -37,7 +37,9 @@ func (ws *WecomSender) CallBack(ctx CallBackContext) {
 		},
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (ws *WecomSender) Send(ctx MessageContext) {
@@ -53,7 +55,7 @@ func (ws *WecomSender) Send(ctx MessageContext) {
 				Content: message,
 			},
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Wecom, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Wecom, ctx.Stats, ctx.Events[0])
 	}
 }
 

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())
@@ -86,260 +70,137 @@ const (
 	builtInOps = `
 ops:
 - name: dashboards
-  cname: Dashboards
+  cname: 仪表盘
   ops:
-    - name: "/dashboards"
-      cname: View Dashboards
-    - name: "/dashboards/add"
-      cname: Add Dashboard
-    - name: "/dashboards/put"
-      cname: Modify Dashboard
-    - name: "/dashboards/del"
-      cname: Delete Dashboard
-    - name: "/embedded-dashboards/put"
-      cname: Modify Embedded Dashboard
-    - name: "/embedded-dashboards"
-      cname: View Embedded Dashboard
-    - name: "/public-dashboards"
-      cname: View Public Dashboard
-
-- name: metric
-  cname: Time Series Metrics
-  ops:
-    - name: "/metric/explorer"
-      cname: View Metric Data
-    - name: "/object/explorer"
-      cname: View Object Data
-
-- name: builtin-metrics
-  cname: Metric Views
-  ops:
-    - name: "/metrics-built-in"
-      cname: View Built-in Metrics
-    - name: "/builtin-metrics/add"
-      cname: Add Built-in Metric
-    - name: "/builtin-metrics/put"
-      cname: Modify Built-in Metric
-    - name: "/builtin-metrics/del"
-      cname: Delete Built-in Metric
-
-- name: recording-rules
-  cname: Recording Rule Management
-  ops:
-    - name: "/recording-rules"
-      cname: View Recording Rules
-    - name: "/recording-rules/add"
-      cname: Add Recording Rule
-    - name: "/recording-rules/put"
-      cname: Modify Recording Rule
-    - name: "/recording-rules/del"
-      cname: Delete Recording Rule
-
-- name: log
-  cname: Log Analysis
-  ops:
-    - name: "/log/explorer"
-      cname: View Logs
-    - name: "/log/index-patterns"
-      cname: View Index Patterns
-    - name: "/log/index-patterns/add"
-      cname: Add Index Pattern
-    - name: "/log/index-patterns/put"
-      cname: Modify Index Pattern
-    - name: "/log/index-patterns/del"
-      cname: Delete Index Pattern
-
+    - "/dashboards"
+    - "/dashboards/add"
+    - "/dashboards/put"
+    - "/dashboards/del"
+    - "/embedded-dashboards/put"
+    - "/embedded-dashboards"
+    - "/public-dashboards"
 
 - name: alert
-  cname: Alert Rules
+  cname: 告警规则
   ops:
-    - name: "/alert-rules"
-      cname: View Alert Rules
-    - name: "/alert-rules/add"
-      cname: Add Alert Rule
-    - name: "/alert-rules/put"
-      cname: Modify Alert Rule
-    - name: "/alert-rules/del"
-      cname: Delete Alert Rule
+    - "/alert-rules"
+    - "/alert-rules/add"
+    - "/alert-rules/put"
+    - "/alert-rules/del"
 
 - name: alert-mutes
-  cname: Alert Silence Management
+  cname: 告警静默管理
   ops:
-    - name: "/alert-mutes"
-      cname: View Alert Silences
-    - name: "/alert-mutes/add"
-      cname: Add Alert Silence
-    - name: "/alert-mutes/put"
-      cname: Modify Alert Silence
-    - name: "/alert-mutes/del"
-      cname: Delete Alert Silence
+    - "/alert-mutes"
+    - "/alert-mutes/add"
+    - "/alert-mutes/put"
+    - "/alert-mutes/del"
   
 - name: alert-subscribes
-  cname: Alert Subscription Management
+  cname: 告警订阅管理
   ops:
-    - name: "/alert-subscribes"
-      cname: View Alert Subscriptions
-    - name: "/alert-subscribes/add"
-      cname: Add Alert Subscription
-    - name: "/alert-subscribes/put"
-      cname: Modify Alert Subscription
-    - name: "/alert-subscribes/del"
-      cname: Delete Alert Subscription
+    - "/alert-subscribes"
+    - "/alert-subscribes/add"
+    - "/alert-subscribes/put"
+    - "/alert-subscribes/del"
 
 - name: alert-events  
-  cname: Alert Event Management
+  cname: 告警事件管理
   ops:
-    - name: "/alert-cur-events"
-      cname: View Current Alerts
-    - name: "/alert-cur-events/del"
-      cname: Delete Current Alert
-    - name: "/alert-his-events"
-      cname: View Historical Alerts
+    - "/alert-cur-events"
+    - "/alert-cur-events/del"
+    - "/alert-his-events" 
 
-- name: notification
-  cname: Alert Notification
+- name: recording-rules
+  cname: 记录规则管理
   ops:
-    - name: "/help/notification-settings"
-      cname: View Notification Settings
-    - name: "/help/notification-tpls"
-      cname: View Notification Templates
+    - "/recording-rules"
+    - "/recording-rules/add"
+    - "/recording-rules/put"
+    - "/recording-rules/del"
 
-- name: job
-  cname: Task Management
+- name: metric
+  cname: 时序指标
   ops:
-    - name: "/job-tpls"
-      cname: View Task Templates
-    - name: "/job-tpls/add"
-      cname: Add Task Template
-    - name: "/job-tpls/put"
-      cname: Modify Task Template
-    - name: "/job-tpls/del"
-      cname: Delete Task Template
-    - name: "/job-tasks"
-      cname: View Task Instances
-    - name: "/job-tasks/add"
-      cname: Add Task Instance
-    - name: "/job-tasks/put"
-      cname: Modify Task Instance
+  - "/metric/explorer"
+  - "/object/explorer"
+
+- name: log
+  cname: 日志分析
+  ops:
+  - "/log/explorer"
+  - "/log/index-patterns"
 
 - name: targets
-  cname: Infrastructure
+  cname: 基础设施
   ops:
-    - name: "/targets"
-      cname: View Objects
-    - name: "/targets/add"
-      cname: Add Object
-    - name: "/targets/put"
-      cname: Modify Object
-    - name: "/targets/del"
-      cname: Delete Object
-    - name: "/targets/bind"
-      cname: Bind Object
+    - "/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: User Management
+  cname: 用户管理
   ops:
-    - name: "/users"
-      cname: View User List
-    - name: "/user-groups"
-      cname: View User Groups
-    - name: "/user-groups/add"
-      cname: Add User Group
-    - name: "/user-groups/put"
-      cname: Modify User Group
-    - name: "/user-groups/del"
-      cname: Delete User Group
-
-- name: busi-groups
-  cname: Business Group Management
-  ops:
-    - name: "/busi-groups"
-      cname: View Business Groups
-    - name: "/busi-groups/add"
-      cname: Add Business Group
-    - name: "/busi-groups/put"
-      cname: Modify Business Group
-    - name: "/busi-groups/del"
-      cname: Delete Business Group
+  - "/users"
+  - "/user-groups"
+  - "/user-groups/add"
+  - "/user-groups/put"
+  - "/user-groups/del"
 
 - name: permissions
-  cname: Permission Management
+  cname: 权限管理
   ops:
-    - name: "/permissions"
-      cname: View Permission Settings
-    
-- name: contacts
-  cname: User Contact Management
+  - "/permissions"
+
+- name: busi-groups
+  cname: 业务分组管理
   ops:
-    - name: "/contacts"
-      cname: User Contact Management
+  - "/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: Template Center
+  cname: 模版中心
   ops:
-    - name: "/built-in-components"
-      cname: View Built-in Components
-    - name: "/built-in-components/add"
-      cname: Add Built-in Component
-    - name: "/built-in-components/put"
-      cname: Modify Built-in Component
-    - name: "/built-in-components/del"
-      cname: Delete Built-in Component
-
-- name: datasource
-  cname: Data Source Management
-  ops:
-    - name: "/help/source"
-      cname: View Data Source Configuration
+    - "/built-in-components"
+    - "/built-in-components/add"
+    - "/built-in-components/put"
+    - "/built-in-components/del"
 
 - name: system
-  cname: System Information
+  cname: 系统信息
   ops:
-    - name: "/help/variable-configs"
-      cname: View Variable Configuration
-    - name: "/help/version"
-      cname: View Version Information
-    - name: "/help/servers"
-      cname: View Server Information
-    - name: "/help/sso"
-      cname: View SSO Configuration
-    - name: "/site-settings"
-      cname: View Site Settings
-
-- name: message-templates
-  cname: Message Templates
-  ops:
-    - name: "/notification-templates"
-      cname: View Message Templates
-    - name: "/notification-templates/add"
-      cname: Add Message Templates
-    - name: "/notification-templates/put"
-      cname: Modify Message Templates
-    - name: "/notification-templates/del"
-      cname: Delete Message Templates
-
-- name: notify-rules
-  cname: Notify Rules
-  ops:
-    - name: "/notification-rules"
-      cname: View Notify Rules
-    - name: "/notification-rules/add"
-      cname: Add Notify Rules
-    - name: "/notification-rules/put"
-      cname: Modify Notify Rules
-    - name: "/notification-rules/del"
-      cname: Delete Notify Rules
-
-- name: notify-channels
-  cname: Notify Channels
-  ops:
-    - name: "/notification-channels"
-      cname: View Notify Channels
-    - name: "/notification-channels/add"
-      cname: Add Notify Channels
-    - name: "/notification-channels/put"
-      cname: Modify Notify Channels
-    - name: "/notification-channels/del"
-      cname: Delete Notify Channels
+  - "/help/variable-configs"
+  - "/help/version"
+  - "/help/servers"
+  - "/help/source"
+  - "/help/sso"
+  - "/help/notification-tpls"
+  - "/help/notification-settings"
+  - "/help/migrate"
+  - "/site-settings"
 `
 )

center/center.go

@@ -4,11 +4,8 @@ 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"
 	"github.com/ccfos/nightingale/v6/alert/process"
 	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/center/cconf"
@@ -29,13 +26,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"
 )
 
@@ -69,7 +67,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	}
 	ctx := ctx.NewContext(context.Background(), db, true)
 	migrate.Migrate(db)
-	isRootInit := models.InitRoot(ctx)
+	models.InitRoot(ctx)
 
 	config.HTTP.JWTAuth.SigningKey = models.InitJWTSigningKey(ctx)
 
@@ -91,10 +89,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	syncStats := memsto.NewSyncStats()
 	alertStats := astats.NewSyncStats()
 
-	if config.Center.MigrateBusiGroupLabel || models.CanMigrateBg(ctx) {
-		models.MigrateBg(ctx, config.Pushgw.BusiGroupLabelKey)
-	}
-
 	configCache := memsto.NewConfigCache(ctx, syncStats, config.HTTP.RSA.RSAPrivateKey, config.HTTP.RSA.RSAPassWord)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
@@ -106,21 +100,13 @@ 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)
+	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 
 	externalProcessors := process.NewExternalProcessors()
-
-	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)
+	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)
 
@@ -130,10 +116,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 models.CanMigrateBg(ctx) {
+			models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
+		}
+	}()
+
 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
 
 	centerRouter.Config(r)
@@ -148,11 +140,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	httpClean := httpx.Init(config.HTTP, r)
 
-	fmt.Printf("please view n9e at  http://%v:%v\n", config.Alert.Heartbeat.IP, config.HTTP.Port)
-	if isRootInit {
-		fmt.Println("username/password: root/root.2020")
-	}
-
 	return func() {
 		logxClean()
 		httpClean()

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")
@@ -121,12 +113,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 			logger.Warning("delete builtin metrics fail ", err)
 		}
 
-		// 删除 uuid%1000 不为 0 uuid > 1000000000000000000 且 type 为 dashboard 的记录
-		err = models.DB(ctx).Exec("delete from builtin_payloads where uuid%1000 != 0 and uuid > 1000000000000000000 and type = 'dashboard' and updated_by = 'system'").Error
-		if err != nil {
-			logger.Warning("delete builtin payloads fail ", err)
-		}
-
 		// alerts
 		files, err = file.FilesUnder(componentDir + "/alerts")
 		if err == nil && len(files) > 0 {
@@ -232,8 +218,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}
 
 				if dashboard.UUID == 0 {
-					time.Sleep(time.Microsecond)
-					dashboard.UUID = time.Now().UnixMicro()
+					dashboard.UUID = time.Now().UnixNano()
 					// 补全文件中的 uuid
 					bs, err = json.MarshalIndent(dashboard, "", "    ")
 					if err != nil {

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()
@@ -183,53 +184,26 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/query-range-batch", rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.promBatchQueryInstant)
 			pages.GET("/datasource/brief", rt.datasourceBriefs)
-			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)
 			pages.POST("/query-instant-batch", rt.auth(), rt.promBatchQueryInstant)
 			pages.GET("/datasource/brief", rt.auth(), rt.user(), rt.datasourceBriefs)
-			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)
@@ -260,9 +234,6 @@ 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.admin(), rt.userAddPost)
@@ -307,7 +278,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.DELETE("/busi-group/:id/members", rt.auth(), rt.user(), rt.perm("/busi-groups/put"), rt.bgrw(), rt.busiGroupMemberDel)
 		pages.DELETE("/busi-group/:id", rt.auth(), rt.user(), rt.perm("/busi-groups/del"), rt.bgrw(), rt.busiGroupDel)
 		pages.GET("/busi-group/:id/perm/:perm", rt.auth(), rt.user(), rt.checkBusiGroupPerm)
-		pages.GET("/busi-groups/tags", rt.auth(), rt.user(), rt.busiGroupsGetTags)
 
 		pages.GET("/targets", rt.auth(), rt.user(), rt.targetGets)
 		pages.GET("/target/extra-meta", rt.auth(), rt.user(), rt.targetExtendInfoByIdent)
@@ -349,11 +319,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)
@@ -372,7 +337,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)
@@ -481,9 +445,9 @@ 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)
@@ -512,31 +476,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		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-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) {
@@ -579,8 +518,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)
@@ -638,15 +575,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)
-
 		}
 	}
 

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)
@@ -79,11 +77,6 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
 			ars[i].FillSeverities()
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
-
 			rids = append(rids, ars[i].Id)
 			names = append(names, ars[i].UpdateBy)
 		}
@@ -130,10 +123,6 @@ func (rt *Router) alertRulesGetByService(c *gin.Context) {
 		cache := make(map[int64]*models.UserGroup)
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
 		}
 	}
 	ginx.NewRender(c).Data(ars, err)
@@ -168,14 +157,6 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}
 
-	for i := range lst {
-		if len(lst[i].DatasourceQueries) == 0 {
-			lst[i].DatasourceQueries = []models.DatasourceQuery{
-				models.DataSourceQueryAll,
-			}
-		}
-	}
-
 	bgid := ginx.UrlParamInt64(c, "id")
 	reterr := rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language"))
 
@@ -183,9 +164,9 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 }
 
 type promRuleForm struct {
-	Payload           string                   `json:"payload" binding:"required"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries" binding:"required"`
-	Disabled          int                      `json:"disabled" binding:"gte=0,lte=1"`
+	Payload       string  `json:"payload" binding:"required"`
+	DatasourceIds []int64 `json:"datasource_ids" binding:"required"`
+	Disabled      int     `json:"disabled" binding:"gte=0,lte=1"`
 }
 
 func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
@@ -204,7 +185,7 @@ func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input yaml is empty")
 	}
 
-	lst := models.DealPromGroup(pr.Groups, f.DatasourceQueries, f.Disabled)
+	lst := models.DealPromGroup(pr.Groups, f.DatasourceIds, f.Disabled)
 	username := c.MustGet("username").(string)
 	bgid := ginx.UrlParamInt64(c, "id")
 	ginx.NewRender(c).Data(rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language")), nil)
@@ -417,27 +398,8 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			}
 		}
 
-		if f.Action == "datasource_change" {
-			// 修改数据源
-			if datasourceQueries, has := f.Fields["datasource_queries"]; has {
-				bytes, err := json.Marshal(datasourceQueries)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"datasource_queries": bytes}))
-				continue
-			}
-		}
-
 		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))
 		}
 	}
 
@@ -455,14 +417,9 @@ func (rt *Router) alertRuleGet(c *gin.Context) {
 		return
 	}
 
-	if len(ar.DatasourceQueries) != 0 {
-		ar.DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ar.Cate, ar.DatasourceQueries)
-	}
-
 	err = ar.FillNotifyGroups(rt.Ctx, make(map[int64]*models.UserGroup))
 	ginx.Dangerous(err)
 
-	rt.AlertRuleModifyHook(ar)
 	ginx.NewRender(c).Data(ar, err)
 }
 
@@ -666,7 +623,7 @@ func (rt *Router) cloneToMachine(c *gin.Context) {
 			newRule.CreateAt = now
 			newRule.RuleConfig = alertRules[i].RuleConfig
 
-			exist, err := models.AlertRuleExists(rt.Ctx, 0, newRule.GroupId, newRule.Name)
+			exist, err := models.AlertRuleExists(rt.Ctx, 0, newRule.GroupId, newRule.DatasourceIdsJson, newRule.Name)
 			if err != nil {
 				errMsg[f.IdentList[j]] = err.Error()
 				continue
@@ -687,49 +644,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 {
@@ -96,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)
@@ -265,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_metrics.go

@@ -102,29 +102,9 @@ func (rt *Router) builtinMetricsDefaultTypes(c *gin.Context) {
 func (rt *Router) builtinMetricsTypes(c *gin.Context) {
 	collector := ginx.QueryStr(c, "collector", "")
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
 	lang := c.GetHeader("X-Language")
 
-	metricTypeList, err := models.BuiltinMetricTypes(rt.Ctx, lang, collector, query)
-	ginx.Dangerous(err)
-
-	componentList, err := models.BuiltinComponentGets(rt.Ctx, "", disabled)
-	ginx.Dangerous(err)
-
-	// 创建一个 map 来存储 componentList 中的类型
-	componentTypes := make(map[string]struct{})
-	for _, comp := range componentList {
-		componentTypes[comp.Ident] = struct{}{}
-	}
-
-	filteredMetricTypeList := make([]string, 0)
-	for _, metricType := range metricTypeList {
-		if _, exists := componentTypes[metricType]; exists {
-			filteredMetricTypeList = append(filteredMetricTypeList, metricType)
-		}
-	}
-
-	ginx.NewRender(c).Data(filteredMetricTypeList, nil)
+	ginx.NewRender(c).Data(models.BuiltinMetricTypes(rt.Ctx, lang, collector, query))
 }
 
 func (rt *Router) builtinMetricsCollectors(c *gin.Context) {

center/router/router_builtin_payload.go

@@ -43,7 +43,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 
 				for _, rule := range alertRules {
 					if rule.UUID == 0 {
-						rule.UUID = time.Now().UnixMicro()
+						rule.UUID = time.Now().UnixNano()
 					}
 
 					contentBytes, err := json.Marshal(rule)
@@ -78,13 +78,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 			}
 
 			if alertRule.UUID == 0 {
-				alertRule.UUID = time.Now().UnixMicro()
-			}
-
-			contentBytes, err := json.Marshal(alertRule)
-			if err != nil {
-				reterr[alertRule.Name] = err.Error()
-				continue
+				alertRule.UUID = time.Now().UnixNano()
 			}
 
 			bp := models.BuiltinPayload{
@@ -94,7 +88,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				Name:        alertRule.Name,
 				Tags:        alertRule.AppendTags,
 				UUID:        alertRule.UUID,
-				Content:     string(contentBytes),
+				Content:     lst[i].Content,
 				CreatedBy:   username,
 				UpdatedBy:   username,
 			}
@@ -112,7 +106,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 
 				for _, dashboard := range dashboards {
 					if dashboard.UUID == 0 {
-						dashboard.UUID = time.Now().UnixMicro()
+						dashboard.UUID = time.Now().UnixNano()
 					}
 
 					contentBytes, err := json.Marshal(dashboard)
@@ -147,13 +141,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 			}
 
 			if dashboard.UUID == 0 {
-				dashboard.UUID = time.Now().UnixMicro()
-			}
-
-			contentBytes, err := json.Marshal(dashboard)
-			if err != nil {
-				reterr[dashboard.Name] = err.Error()
-				continue
+				dashboard.UUID = time.Now().UnixNano()
 			}
 
 			bp := models.BuiltinPayload{
@@ -163,7 +151,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				Name:        dashboard.Name,
 				Tags:        dashboard.Tags,
 				UUID:        dashboard.UUID,
-				Content:     string(contentBytes),
+				Content:     lst[i].Content,
 				CreatedBy:   username,
 				UpdatedBy:   username,
 			}

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)
 }
 
@@ -140,12 +140,3 @@ func (rt *Router) busiGroupGet(c *gin.Context) {
 	ginx.Dangerous(bg.FillUserGroups(rt.Ctx))
 	ginx.NewRender(c).Data(bg, nil)
 }
-
-func (rt *Router) busiGroupsGetTags(c *gin.Context) {
-	bgids := strx.IdsInt64ForAPI(ginx.QueryStr(c, "gids", ""), ",")
-	targetIdents, err := models.TargetIndentsGetByBgids(rt.Ctx, bgids)
-	ginx.Dangerous(err)
-	tags, err := models.TargetGetTags(rt.Ctx, targetIdents, true, "busigroup")
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Data(tags, nil)
-}

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

@@ -93,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
 		}
 	}
 
@@ -124,14 +122,12 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 }
 
 func DatasourceCheck(ds models.Datasource) error {
-	if ds.PluginType == models.PROMETHEUS || ds.PluginType == models.LOKI || ds.PluginType == models.TDENGINE {
-		if ds.HTTPJson.Url == "" {
-			return fmt.Errorf("url is empty")
-		}
+	if ds.HTTPJson.Url == "" {
+		return fmt.Errorf("url is empty")
+	}
 
-		if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
-			return fmt.Errorf("url must start with http or https")
-		}
+	if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
+		return fmt.Errorf("url must start with http or https")
 	}
 
 	client := &http.Client{
@@ -142,11 +138,11 @@ func DatasourceCheck(ds models.Datasource) error {
 		},
 	}
 
-	var fullURL string
-	req, err := ds.HTTPJson.NewReq(&fullURL)
+	fullURL := ds.HTTPJson.Url
+	req, err := http.NewRequest("GET", fullURL, nil)
 	if err != nil {
 		logger.Errorf("Error creating request: %v", err)
-		return fmt.Errorf("request urls:%v failed", ds.HTTPJson.GetUrls())
+		return fmt.Errorf("request url:%s failed", fullURL)
 	}
 
 	if ds.PluginType == models.PROMETHEUS {
@@ -253,37 +249,3 @@ func (rt *Router) getDatasourceIds(c *gin.Context) {
 
 	ginx.NewRender(c).Data(datasourceIds, err)
 }
-
-type datasourceQueryForm struct {
-	Cate              string                   `json:"datasource_cate"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries"`
-}
-
-type datasourceQueryResp struct {
-	ID   int64  `json:"id"`
-	Name string `json:"name"`
-}
-
-func (rt *Router) datasourceQuery(c *gin.Context) {
-	var dsf datasourceQueryForm
-	ginx.BindJSON(c, &dsf)
-	datasources, err := models.GetDatasourcesGetsByTypes(rt.Ctx, []string{dsf.Cate})
-	ginx.Dangerous(err)
-
-	nameToID := make(map[string]int64)
-	IDToName := make(map[int64]string)
-	for _, ds := range datasources {
-		nameToID[ds.Name] = ds.Id
-		IDToName[ds.Id] = ds.Name
-	}
-
-	ids := models.GetDatasourceIDsByDatasourceQueries(dsf.DatasourceQueries, IDToName, nameToID)
-	var req []datasourceQueryResp
-	for _, id := range ids {
-		req = append(req, datasourceQueryResp{
-			ID:   id,
-			Name: IDToName[id],
-		})
-	}
-	ginx.NewRender(c).Data(req, err)
-}

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_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_funcs.go

@@ -36,10 +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 "datasource":
 		// datasource update_at is different from others
 		statistics, err = models.DatasourceStatistics(rt.Ctx)
@@ -53,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")
 	}

center/router/router_heartbeat.go

@@ -100,7 +100,7 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 				groupIds = append(groupIds, groupId)
 			}
 
-			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds, nil)
+			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds)
 			if err != nil {
 				logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
 			}
@@ -113,7 +113,7 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 				}
 
 				if !target.MatchGroupId(groupId) {
-					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId}, nil)
+					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId})
 					if err != nil {
 						logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
 					}

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,214 +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/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 {
-		ginx.Dangerous(tpl.Verify())
-		if !isAdmin && !slice.HaveIntersection(gids, tpl.UserGroupIds) {
-			ginx.Bomb(http.StatusForbidden, "no permission")
-		}
-		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[int64](gids, t.UserGroupIds) {
-				ginx.Bomb(http.StatusForbidden, "no permission")
-			}
-		}
-	}
-
-	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[int64](gids, mt.UserGroupIds) {
-			ginx.Bomb(http.StatusForbidden, "no permission")
-		}
-	}
-
-	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[int64](gids, mt.UserGroupIds) {
-		ginx.Bomb(http.StatusForbidden, "no permission")
-	}
-
-	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

@@ -7,10 +7,10 @@ import (
 
 	"github.com/ccfos/nightingale/v6/alert/common"
 	"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
@@ -22,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)

center/router/router_mw.go

@@ -17,10 +17,6 @@ import (
 	"github.com/toolkits/pkg/ginx"
 )
 
-const (
-	DefaultTokenKey = "X-User-Token"
-)
-
 type AccessDetails struct {
 	AccessUuid   string
 	UserIdentity string
@@ -66,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")
@@ -125,7 +100,7 @@ func (rt *Router) auth() gin.HandlerFunc {
 	if rt.HTTP.ProxyAuth.Enable {
 		return rt.proxyAuth()
 	} else {
-		return rt.tokenAuth()
+		return rt.jwtAuth()
 	}
 }
 
@@ -155,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")
 		}
@@ -335,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),
@@ -361,43 +330,18 @@ 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 {
-		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 {
-		return err
-	}
-
-	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
@@ -444,10 +388,9 @@ type TokenDetails struct {
 }
 
 func (rt *Router) createTokens(signingKey, userIdentity string) (*TokenDetails, error) {
-	username := strings.Split(userIdentity, "-")[1]
 	td := &TokenDetails{}
 	td.AtExpires = time.Now().Add(time.Minute * time.Duration(rt.HTTP.JWTAuth.AccessExpired)).Unix()
-	td.AccessUuid = username + "/" + uuid.NewString()
+	td.AccessUuid = uuid.NewString()
 
 	td.RtExpires = time.Now().Add(time.Minute * time.Duration(rt.HTTP.JWTAuth.RefreshExpired)).Unix()
 	td.RefreshUuid = td.AccessUuid + "++" + userIdentity

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,29 @@ 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
+	var req models.NotificaitonRecord
 	ginx.BindJSON(c, &req)
-	err := sender.PushNotifyRecords(req)
-	ginx.Dangerous(err, 429)
+	err := req.Add(rt.Ctx)
 
-	ginx.NewRender(c).Data(nil, err)
+	ginx.NewRender(c).Data(req.Id, err)
 }
 
 func (rt *Router) notificationRecordList(c *gin.Context) {
@@ -110,10 +111,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 +123,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,321 +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, "no permission")
-		}
-
-		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[int64](gids, t.UserGroupIds) {
-				ginx.Bomb(http.StatusForbidden, "no permission")
-			}
-		}
-	}
-
-	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[int64](gids, nr.UserGroupIds) && !me.IsAdmin() {
-		ginx.Bomb(http.StatusForbidden, "no permission")
-	}
-
-	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[int64](gids, nr.UserGroupIds) && !me.IsAdmin() {
-		ginx.Bomb(http.StatusForbidden, "no permission")
-	}
-
-	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":
-		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

@@ -161,10 +161,6 @@ func (rt *Router) notifyTplPreview(c *gin.Context) {
 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)
 	ginx.Dangerous(templateValidate(f))
 
@@ -173,8 +169,6 @@ func (rt *Router) notifyTplAdd(c *gin.Context) {
 	if count != 0 {
 		ginx.Bomb(200, "Refuse to create duplicate channel(unique)")
 	}
-
-	f.CreateAt = time.Now().Unix()
 	ginx.NewRender(c).Message(f.Create(rt.Ctx))
 }
 
@@ -193,13 +187,3 @@ func (rt *Router) notifyTplDel(c *gin.Context) {
 
 	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_proxy.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httputil"
+	"net/url"
 	"strings"
 	"sync"
 	"time"
@@ -111,9 +112,9 @@ func (rt *Router) dsProxy(c *gin.Context) {
 		return
 	}
 
-	target, err := ds.HTTPJson.ParseUrl()
+	target, err := url.Parse(ds.HTTPJson.Url)
 	if err != nil {
-		c.String(http.StatusInternalServerError, "invalid urls: %s", ds.HTTPJson.GetUrls())
+		c.String(http.StatusInternalServerError, "invalid  url: %s", ds.HTTPJson.Url)
 		return
 	}
 

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("no permission")
-		}
-
-		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("no permission")
-		}
-
-		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("no permission")
-		}
-
-		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, "no permission")
-		}
-
-		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

@@ -3,13 +3,15 @@ package router
 import (
 	"encoding/json"
 	"net/http"
+	"strconv"
+	"strings"
 	"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 +21,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)
@@ -72,14 +74,6 @@ func (rt *Router) recordingRuleAddByFE(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}
 
-	for i := range lst {
-		if len(lst[i].DatasourceQueries) == 0 {
-			lst[i].DatasourceQueries = []models.DatasourceQuery{
-				models.DataSourceQueryAll,
-			}
-		}
-	}
-
 	bgid := ginx.UrlParamInt64(c, "id")
 	reterr := make(map[string]string)
 	for i := 0; i < count; i++ {
@@ -143,10 +137,23 @@ func (rt *Router) recordingRulePutFields(c *gin.Context) {
 	f.Fields["update_by"] = c.MustGet("username").(string)
 	f.Fields["update_at"] = time.Now().Unix()
 
-	if datasourceQueries, ok := f.Fields["datasource_queries"]; ok {
-		bytes, err := json.Marshal(datasourceQueries)
-		ginx.Dangerous(err)
-		f.Fields["datasource_queries"] = string(bytes)
+	if _, ok := f.Fields["datasource_ids"]; ok {
+		// datasource_ids = "1 2 3"
+		idsStr := strings.Fields(f.Fields["datasource_ids"].(string))
+		ids := make([]int64, 0)
+		for _, idStr := range idsStr {
+			id, err := strconv.ParseInt(idStr, 10, 64)
+			if err != nil {
+				ginx.Bomb(http.StatusBadRequest, "datasource_ids error")
+			}
+			ids = append(ids, id)
+		}
+
+		bs, err := json.Marshal(ids)
+		if err != nil {
+			ginx.Bomb(http.StatusBadRequest, "datasource_ids error")
+		}
+		f.Fields["datasource_ids"] = string(bs)
 	}
 
 	for i := 0; i < len(f.Ids); i++ {

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_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,11 +55,7 @@ func (rt *Router) targetGets(c *gin.Context) {
 	hosts := queryStrListField(c, "hosts", ",", " ", "\n")
 
 	var err error
-	if len(bgids) > 0 {
-		for _, gid := range bgids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
+	if len(bgids) == 0 {
 		user := c.MustGet("user").(*models.User)
 		if !user.IsAdmin() {
 			// 如果是非 admin 用户，全部对象的情况，找到用户有权限的业务组
@@ -174,7 +169,7 @@ func (rt *Router) targetGetTags(c *gin.Context) {
 	idents := ginx.QueryStr(c, "idents", "")
 	idents = strings.ReplaceAll(idents, ",", " ")
 	ignoreHostTag := ginx.QueryBool(c, "ignore_host_tag", false)
-	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents), ignoreHostTag, "")
+	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents), ignoreHostTag)
 	ginx.NewRender(c).Data(lst, err)
 }
 
@@ -277,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)
 		}
 	}
@@ -400,25 +397,9 @@ type targetBgidsForm struct {
 	Idents  []string `json:"idents" binding:"required_without=HostIps"`
 	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
 	Bgids   []int64  `json:"bgids"`
-	Tags    []string `json:"tags"`
 	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,25 +442,21 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 				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, "No permission. Only admin can assign BG")
-			}
+		can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
+		ginx.Dangerous(err)
+		if !can {
+			ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
 		}
 	}
 
 	switch f.Action {
 	case "add":
-		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
+		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids))
 	case "del":
 		ginx.NewRender(c).Data(failedResults, models.TargetUnbindBgids(rt.Ctx, f.Idents, f.Bgids))
 	case "reset":
-		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
+		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids))
 	default:
 		ginx.Bomb(http.StatusBadRequest, "invalid action")
 	}
@@ -501,7 +478,7 @@ func (rt *Router) targetUpdateBgidByService(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}
 
-	ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, []int64{f.Bgid}, nil))
+	ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, []int64{f.Bgid}))
 }
 
 type identsForm struct {
@@ -574,18 +551,3 @@ func (rt *Router) targetsOfAlertRule(c *gin.Context) {
 
 	ginx.NewRender(c).Data(ret, err)
 }
-
-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

@@ -5,11 +5,11 @@ import (
 
 	"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) {
@@ -40,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)

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)

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, 0)
+		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_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)

cli/upgrade/config.go

@@ -33,7 +33,7 @@ type ClusterOptions struct {
 	MaxIdleConnsPerHost int
 }
 
-func Parse(fpath string, configPtr *Config) error {
+func Parse(fpath string, configPtr interface{}) error {
 	var (
 		tBuf []byte
 	)

cmd/edge/edge.go

@@ -7,23 +7,22 @@ import (
 
 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/process"
 	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"
 )
 
@@ -61,8 +60,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	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 +71,13 @@ 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,114 +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",
-	}
-}
-
-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"`
-	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/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"`
-}

datasource/tdengine/tdengine.go

@@ -1,460 +0,0 @@
-package tdengine
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/prometheus/common/model"
-	"github.com/toolkits/pkg/logger"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	td "github.com/ccfos/nightingale/v6/dskit/tdengine"
-	"github.com/ccfos/nightingale/v6/models"
-
-	"github.com/mitchellh/mapstructure"
-)
-
-const (
-	TDEngineType = "tdengine"
-)
-
-type TDengine struct {
-	td.Tdengine `json:",inline" mapstructure:",squash"`
-}
-
-type TdengineQuery struct {
-	From     string `json:"from"`
-	Interval int64  `json:"interval"`
-	Keys     Keys   `json:"keys"`
-	Query    string `json:"query"` // 查询条件
-	Ref      string `json:"ref"`   // 变量
-	To       string `json:"to"`
-}
-
-type Keys struct {
-	LabelKey   string `json:"labelKey"`  // 多个用空格分隔
-	MetricKey  string `json:"metricKey"` // 多个用空格分隔
-	TimeFormat string `json:"timeFormat"`
-}
-
-func init() {
-	datasource.RegisterDatasource(TDEngineType, new(TDengine))
-}
-
-func (td *TDengine) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(TDengine)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (td *TDengine) InitClient() error {
-	td.InitCli()
-	return nil
-}
-
-func (td *TDengine) Equal(other datasource.Datasource) bool {
-	otherTD, ok := other.(*TDengine)
-	if !ok {
-		return false
-	}
-
-	if td.Addr != otherTD.Addr {
-		return false
-	}
-
-	if td.Basic != nil && otherTD.Basic != nil {
-		if td.Basic.User != otherTD.Basic.User {
-			return false
-		}
-
-		if td.Basic.Password != otherTD.Basic.Password {
-			return false
-		}
-	}
-
-	if td.Token != otherTD.Token {
-		return false
-	}
-
-	if td.Timeout != otherTD.Timeout {
-		return false
-	}
-
-	if td.DialTimeout != otherTD.DialTimeout {
-		return false
-	}
-
-	if td.MaxIdleConnsPerHost != otherTD.MaxIdleConnsPerHost {
-		return false
-	}
-
-	if len(td.Headers) != len(otherTD.Headers) {
-		return false
-	}
-
-	for k, v := range td.Headers {
-		if otherV, ok := otherTD.Headers[k]; !ok || v != otherV {
-			return false
-		}
-	}
-	return true
-}
-
-func (td *TDengine) Validate(ctx context.Context) (err error) {
-	return nil
-}
-
-func (td *TDengine) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (td *TDengine) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (td *TDengine) QueryData(ctx context.Context, queryParam interface{}) ([]models.DataResp, error) {
-	return td.Query(queryParam, 0)
-}
-
-func (td *TDengine) QueryLog(ctx context.Context, queryParam interface{}) ([]interface{}, int64, error) {
-	b, err := json.Marshal(queryParam)
-	if err != nil {
-		return nil, 0, err
-	}
-	var q TdengineQuery
-	err = json.Unmarshal(b, &q)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	if q.Interval == 0 {
-		q.Interval = 60
-	}
-
-	if q.From == "" {
-		// 2023-09-21T05:37:30.000Z format
-		to := time.Now().Unix()
-		q.To = time.Unix(to, 0).UTC().Format(time.RFC3339)
-		from := to - q.Interval
-		q.From = time.Unix(from, 0).UTC().Format(time.RFC3339)
-	}
-
-	replacements := map[string]string{
-		"$from":     fmt.Sprintf("'%s'", q.From),
-		"$to":       fmt.Sprintf("'%s'", q.To),
-		"$interval": fmt.Sprintf("%ds", q.Interval),
-	}
-
-	for key, val := range replacements {
-		q.Query = strings.ReplaceAll(q.Query, key, val)
-	}
-
-	if !strings.Contains(q.Query, "limit") {
-		q.Query = q.Query + " limit 200"
-	}
-
-	data, err := td.QueryTable(q.Query)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	return ConvertToTable(data), int64(len(data.Data)), nil
-}
-
-func (td *TDengine) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (td *TDengine) Query(query interface{}, delay ...int) ([]models.DataResp, error) {
-	b, err := json.Marshal(query)
-	if err != nil {
-		return nil, err
-	}
-	var q TdengineQuery
-	err = json.Unmarshal(b, &q)
-	if err != nil {
-		return nil, err
-	}
-
-	if q.Interval == 0 {
-		q.Interval = 60
-	}
-
-	delaySec := 0
-	if len(delay) > 0 {
-		delaySec = delay[0]
-	}
-
-	if q.From == "" {
-		// 2023-09-21T05:37:30.000Z format
-		to := time.Now().Unix() - int64(delaySec)
-		q.To = time.Unix(to, 0).UTC().Format(time.RFC3339)
-		from := to - q.Interval
-		q.From = time.Unix(from, 0).UTC().Format(time.RFC3339)
-	}
-
-	replacements := map[string]string{
-		"$from":     fmt.Sprintf("'%s'", q.From),
-		"$to":       fmt.Sprintf("'%s'", q.To),
-		"$interval": fmt.Sprintf("%ds", q.Interval),
-	}
-
-	for key, val := range replacements {
-		q.Query = strings.ReplaceAll(q.Query, key, val)
-	}
-
-	data, err := td.QueryTable(q.Query)
-	if err != nil {
-		return nil, err
-	}
-	logger.Debugf("tdengine query:%s result: %+v", q.Query, data)
-
-	return ConvertToTStData(data, q.Keys, q.Ref)
-}
-
-func ConvertToTStData(src td.APIResponse, key Keys, ref string) ([]models.DataResp, error) {
-	metricIdxMap := make(map[string]int)
-	labelIdxMap := make(map[string]int)
-
-	metricMap := make(map[string]struct{})
-	if key.MetricKey != "" {
-		metricList := strings.Split(key.MetricKey, " ")
-		for _, metric := range metricList {
-			metricMap[metric] = struct{}{}
-		}
-	}
-
-	labelMap := make(map[string]string)
-	if key.LabelKey != "" {
-		labelList := strings.Split(key.LabelKey, " ")
-		for _, label := range labelList {
-			labelMap[label] = label
-		}
-	}
-
-	tsIdx := -1
-	for colIndex, colData := range src.ColumnMeta {
-		colName := colData[0].(string)
-		var colType string
-		// 处理v2版本数字类型和v3版本字符串类型
-		switch t := colData[1].(type) {
-		case float64:
-			// v2版本数字类型映射
-			switch int(t) {
-			case 1:
-				colType = "BOOL"
-			case 2:
-				colType = "TINYINT"
-			case 3:
-				colType = "SMALLINT"
-			case 4:
-				colType = "INT"
-			case 5:
-				colType = "BIGINT"
-			case 6:
-				colType = "FLOAT"
-			case 7:
-				colType = "DOUBLE"
-			case 8:
-				colType = "BINARY"
-			case 9:
-				colType = "TIMESTAMP"
-			case 10:
-				colType = "NCHAR"
-			default:
-				colType = "UNKNOWN"
-			}
-		case string:
-			// v3版本直接使用字符串类型
-			colType = t
-		default:
-			logger.Warningf("unexpected column type format: %v", colData[1])
-			continue
-		}
-
-		switch colType {
-		case "TIMESTAMP":
-			tsIdx = colIndex
-		case "BIGINT", "INT", "INT UNSIGNED", "BIGINT UNSIGNED", "FLOAT", "DOUBLE",
-			"SMALLINT", "SMALLINT UNSIGNED", "TINYINT", "TINYINT UNSIGNED", "BOOL":
-			if len(metricMap) > 0 {
-				if _, ok := metricMap[colName]; !ok {
-					continue
-				}
-				metricIdxMap[colName] = colIndex
-			} else {
-				metricIdxMap[colName] = colIndex
-			}
-		default:
-			if len(labelMap) > 0 {
-				if _, ok := labelMap[colName]; !ok {
-					continue
-				}
-				labelIdxMap[colName] = colIndex
-			} else {
-				labelIdxMap[colName] = colIndex
-			}
-		}
-	}
-
-	if tsIdx == -1 {
-		return nil, fmt.Errorf("timestamp column not found, please check your query")
-	}
-
-	var result []models.DataResp
-	m := make(map[string]*models.DataResp)
-	for _, row := range src.Data {
-		for metricName, metricIdx := range metricIdxMap {
-			value, err := interfaceToFloat64(row[metricIdx])
-			if err != nil {
-				logger.Warningf("parse %v value failed: %v", row, err)
-				continue
-			}
-
-			metric := make(model.Metric)
-			for labelName, labelIdx := range labelIdxMap {
-				metric[model.LabelName(labelName)] = model.LabelValue(row[labelIdx].(string))
-			}
-
-			metric[model.MetricNameLabel] = model.LabelValue(metricName)
-
-			// transfer 2022-06-29T05:52:16.603Z to unix timestamp
-			t, err := parseTimeString(row[tsIdx].(string))
-			if err != nil {
-				logger.Warningf("parse %v timestamp failed: %v", row, err)
-				continue
-			}
-
-			timestamp := t.Unix()
-			if _, ok := m[metric.String()]; !ok {
-				m[metric.String()] = &models.DataResp{
-					Metric: metric,
-					Values: [][]float64{
-						{float64(timestamp), value},
-					},
-				}
-			} else {
-				m[metric.String()].Values = append(m[metric.String()].Values, []float64{float64(timestamp), value})
-			}
-		}
-	}
-
-	for _, v := range m {
-		v.Ref = ref
-		result = append(result, *v)
-	}
-
-	return result, nil
-}
-
-func interfaceToFloat64(input interface{}) (float64, error) {
-	// Check for the kind of the value first
-	if input == nil {
-		return 0, fmt.Errorf("unsupported type: %T", input)
-	}
-
-	kind := reflect.TypeOf(input).Kind()
-	switch kind {
-	case reflect.Float64:
-		return input.(float64), nil
-	case reflect.Float32:
-		return float64(input.(float32)), nil
-	case reflect.Int, reflect.Int32, reflect.Int64, reflect.Int8, reflect.Int16:
-		return float64(reflect.ValueOf(input).Int()), nil
-	case reflect.Uint, reflect.Uint32, reflect.Uint64, reflect.Uint8, reflect.Uint16:
-		return float64(reflect.ValueOf(input).Uint()), nil
-	case reflect.String:
-		return strconv.ParseFloat(input.(string), 64)
-	case reflect.Bool:
-		if input.(bool) {
-			return 1.0, nil
-		}
-		return 0.0, nil
-	default:
-		return 0, fmt.Errorf("unsupported type: %T", input)
-	}
-}
-
-func parseTimeString(ts string) (time.Time, error) {
-	// 尝试不同的时间格式
-	formats := []string{
-		// 标准格式
-		time.Layout,      // "01/02 03:04:05PM '06 -0700"
-		time.ANSIC,       // "Mon Jan _2 15:04:05 2006"
-		time.UnixDate,    // "Mon Jan _2 15:04:05 MST 2006"
-		time.RubyDate,    // "Mon Jan 02 15:04:05 -0700 2006"
-		time.RFC822,      // "02 Jan 06 15:04 MST"
-		time.RFC822Z,     // "02 Jan 06 15:04 -0700"
-		time.RFC850,      // "Monday, 02-Jan-06 15:04:05 MST"
-		time.RFC1123,     // "Mon, 02 Jan 2006 15:04:05 MST"
-		time.RFC1123Z,    // "Mon, 02 Jan 2006 15:04:05 -0700"
-		time.RFC3339,     // "2006-01-02T15:04:05Z07:00"
-		time.RFC3339Nano, // "2006-01-02T15:04:05.999999999Z07:00"
-		time.Kitchen,     // "3:04PM"
-
-		// 实用时间戳格式
-		time.Stamp,      // "Jan _2 15:04:05"
-		time.StampMilli, // "Jan _2 15:04:05.000"
-		time.StampMicro, // "Jan _2 15:04:05.000000"
-		time.StampNano,  // "Jan _2 15:04:05.000000000"
-		time.DateTime,   // "2006-01-02 15:04:05"
-		time.DateOnly,   // "2006-01-02"
-		time.TimeOnly,   // "15:04:05"
-
-		// 常用自定义格式
-		"2006-01-02T15:04:05", // 无时区的ISO格式
-		"2006-01-02T15:04:05.000Z",
-		"2006-01-02T15:04:05Z",
-		"2006-01-02 15:04:05.999999999", // 纳秒
-		"2006-01-02 15:04:05.999999",    // 微秒
-		"2006-01-02 15:04:05.999",       // 毫秒
-		"2006/01/02",
-		"20060102",
-		"01/02/2006",
-		"2006年01月02日",
-		"2006年01月02日 15:04:05",
-	}
-
-	var lastErr error
-	for _, format := range formats {
-		t, err := time.Parse(format, ts)
-		if err == nil {
-			return t, nil
-		}
-		lastErr = err
-	}
-
-	// 尝试解析 Unix 时间戳
-	if timestamp, err := strconv.ParseInt(ts, 10, 64); err == nil {
-		switch len(ts) {
-		case 10: // 秒
-			return time.Unix(timestamp, 0), nil
-		case 13: // 毫秒
-			return time.Unix(timestamp/1000, (timestamp%1000)*1000000), nil
-		case 16: // 微秒
-			return time.Unix(timestamp/1000000, (timestamp%1000000)*1000), nil
-		case 19: // 纳秒
-			return time.Unix(timestamp/1000000000, timestamp%1000000000), nil
-		}
-	}
-
-	return time.Time{}, fmt.Errorf("failed to parse time with any format: %v", lastErr)
-}
-
-func ConvertToTable(src td.APIResponse) []interface{} {
-	var resp []interface{}
-
-	for i := range src.Data {
-		cur := make(map[string]interface{})
-		for j := range src.Data[i] {
-			cur[src.ColumnMeta[j][0].(string)] = src.Data[i][j]
-		}
-		resp = append(resp, cur)
-	}
-	return resp
-}

docker/compose-bridge/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3.7"
+
 networks:
   nightingale:
     driver: bridge

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

@@ -19,8 +19,8 @@ precision = "ms"
 # global collect interval
 interval = 15
 
-# [global.labels]
-# source="categraf"
+[global.labels]
+source="categraf"
 # region = "shanghai"
 # env = "localhost"
 

docker/compose-bridge/etc-categraf/input.mysql/mysql.toml

@@ -1,42 +0,0 @@
-[[instances]]
-address = "mysql:3306"
-username = "root"
-password = "1234"
-
-# # set tls=custom to enable tls
-# parameters = "tls=false"
-
-# extra_status_metrics = true
-# extra_innodb_metrics = false
-# gather_processlist_processes_by_state = false
-# gather_processlist_processes_by_user = false
-# gather_schema_size = true
-# gather_table_size = false
-# gather_system_table_size = false
-# gather_slave_status = true
-
-# # timeout
-# timeout_seconds = 3
-
-# # interval = global.interval * interval_times
-# interval_times = 1
-
-# important! use global unique string to specify instance
-labels = { instance="docker-compose-mysql" }
-
-## Optional TLS Config
-# use_tls = false
-# tls_min_version = "1.2"
-# tls_ca = "/etc/categraf/ca.pem"
-# tls_cert = "/etc/categraf/cert.pem"
-# tls_key = "/etc/categraf/key.pem"
-## Use TLS but skip chain & host verification
-# insecure_skip_verify = true
-
-#[[instances.queries]]
-# mesurement = "lock_wait"
-# metric_fields = [ "total" ]
-# timeout = "3s"
-# request = '''
-#SELECT count(*) as total FROM information_schema.innodb_trx WHERE trx_state='LOCK WAIT'
-#'''

docker/compose-bridge/etc-categraf/input.redis/redis.toml

@@ -1,37 +0,0 @@
-[[instances]]
-address = "redis:6379"
-username = ""
-password = ""
-# pool_size = 2
-
-## 是否开启slowlog 收集
-# gather_slowlog = true
-## 最多收集少条slowlog
-# slowlog_max_len = 100
-## 收集距离现在多少秒以内的slowlog
-## 注意插件的采集周期,该参数不要小于采集周期，否则会有slowlog查不到
-# slowlog_time_window=30
-
-# 指标
-# redis_slow_log{ident=dev-01 client_addr=127.0.0.1:56364 client_name= cmd="info ALL" log_id=983} 74 (单位微秒)
-
-# # Optional. Specify redis commands to retrieve values
-# commands = [
-#     {command = ["get", "sample-key1"], metric = "custom_metric_name1"},
-#     {command = ["get", "sample-key2"], metric = "custom_metric_name2"}
-# ]
-
-# # interval = global.interval * interval_times
-# interval_times = 1
-
-# important! use global unique string to specify instance
-labels = { instance="docker-compose-redis" }
-
-## Optional TLS Config
-# use_tls = false
-# tls_min_version = "1.2"
-# tls_ca = "/etc/categraf/ca.pem"
-# tls_cert = "/etc/categraf/cert.pem"
-# tls_key = "/etc/categraf/key.pem"
-## Use TLS but skip chain & host verification
-# insecure_skip_verify = true

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

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
@@ -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

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

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

docker/compose-host-network/docker-compose.yaml

@@ -25,7 +25,7 @@ services:
     network_mode: host
 
   prometheus:
-    image: prom/prometheus:v2.55.1
+    image: prom/prometheus
     container_name: prometheus
     hostname: prometheus
     restart: always

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

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql

@@ -790,7 +790,6 @@ CREATE TABLE es_index_pattern (
     time_field varchar(128) not null default '@timestamp',
     allow_hide_system_indices smallint not null default 0,
     fields_format varchar(4096) not null default '',
-    cross_cluster_enabled int not null default 0,
     create_at bigint default '0',
     create_by varchar(64) default '',
     update_at bigint default '0',
@@ -860,7 +859,6 @@ CREATE TABLE builtin_components (
   ident VARCHAR(191) NOT NULL,
   logo VARCHAR(191) NOT NULL,
   readme TEXT NOT NULL,
-  disabled INT NOT NULL DEFAULT 0,
   created_at BIGINT NOT NULL DEFAULT 0,
   created_by VARCHAR(191) NOT NULL DEFAULT '',
   updated_at BIGINT NOT NULL DEFAULT 0,
@@ -887,20 +885,4 @@ CREATE TABLE builtin_payloads (
 CREATE INDEX idx_component ON builtin_payloads (component);
 CREATE INDEX idx_builtin_payloads_name ON builtin_payloads (name);
 CREATE INDEX idx_cate ON builtin_payloads (cate);
-CREATE INDEX idx_type ON builtin_payloads (type);
-
-
-CREATE TABLE dash_annotation (
-    id bigserial PRIMARY KEY,
-    dashboard_id bigint not null,
-    panel_id varchar(191) not null,
-    tags text,
-    description text,
-    config text,
-    time_start bigint not null default 0,
-    time_end bigint not null default 0,
-    create_at bigint not null default 0,
-    create_by varchar(64) not null default '',
-    update_at bigint not null default 0,
-    update_by varchar(64) not null default ''
-);
+CREATE INDEX idx_type ON builtin_payloads (type);

docker/compose-postgres/n9eetc_pg/config.toml

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"