From a55bc772b8709c5b20c3c9bfeb50ff413c391a26 Mon Sep 17 00:00:00 2001 From: shanwb Date: Fri, 13 Sep 2024 15:48:25 +0800 Subject: [PATCH] refactor: update prometheus module change run.mone to org.apache (#457) (#470) --- .../alertmanager/impl/AlertManagerImpl.java | 12 +++---- .../service/scrapeJob/impl/ScrapeJobImpl.java | 14 ++++---- .../ozhera-prometheus-agent-api/pom.xml | 4 +-- .../agent/api/bo/PrometheusReq.java | 2 +- .../prometheus/agent/api/bo/Result.java | 2 +- .../api/service/PrometheusAlertService.java | 6 ++-- .../api/service/PrometheusDubboService.java | 6 ++-- .../service/PrometheusScrapeJobService.java | 6 ++-- .../ozhera-prometheus-agent-client/pom.xml | 4 +-- .../ozhera}/prometheus/agent/BaseClient.java | 4 +-- .../AlertManagerAliClient.java | 20 ++++++------ .../AlertManagerClient.java | 24 +++++++------- .../AlertManagerVMClient.java | 24 +++++++------- .../prometheus/agent/client/Client.java | 2 +- .../agent/operators/BasicOperator.java | 2 +- .../ali/AliAlertMessageTemplate.java | 2 +- .../operators/ali/AliPrometheusOperator.java | 10 +++--- .../local/LocalPrometheusOperator.java | 4 +-- .../operators/vm/VMPrometheusOperator.java | 4 +-- .../prometheusClient/PrometheusAliClient.java | 28 ++++++++-------- .../prometheusClient/PrometheusClient.java | 28 ++++++++-------- .../prometheusClient/PrometheusVMClient.java | 24 +++++++------- .../ozhera-prometheus-agent-common/pom.xml | 4 +-- .../ozhera}/prometheus/agent/Commons.java | 2 +- .../ozhera}/prometheus/agent/enums/Base.java | 2 +- .../prometheus/agent/enums/ClientType.java | 2 +- .../prometheus/agent/enums/ErrorCode.java | 2 +- .../agent/enums/RuleAlertStatusEnum.java | 2 +- .../agent/enums/RuleSilenceStatusEnum.java | 2 +- .../agent/enums/ScrapeJobStatusEnum.java | 2 +- .../prometheus/agent/param/ArgCheck.java | 2 +- .../prometheus/agent/param/BaseParam.java | 2 +- .../agent/param/alert/AMSilence.java | 2 +- .../agent/param/alert/AMSilenceResponse.java | 2 +- .../agent/param/alert/AMSilenceStatus.java | 2 +- .../prometheus/agent/param/alert/Matcher.java | 2 +- .../agent/param/alert/RuleAlertParam.java | 4 +-- .../agent/param/alert/RuleSilenceParam.java | 4 +-- .../alertManager/AlertManagerConfig.java | 2 +- .../agent/param/alertManager/Group.java | 2 +- .../agent/param/alertManager/Rule.java | 2 +- .../param/prometheus/Alert_static_config.java | 2 +- .../agent/param/prometheus/Alerting.java | 2 +- .../agent/param/prometheus/Alertmanagers.java | 2 +- .../agent/param/prometheus/Authorization.java | 2 +- .../agent/param/prometheus/BasicAuth.java | 2 +- .../param/prometheus/External_labels.java | 2 +- .../param/prometheus/File_sd_configs.java | 2 +- .../agent/param/prometheus/Global.java | 2 +- .../param/prometheus/Http_sd_configs.java | 2 +- .../prometheus/Metric_relabel_configs.java | 2 +- .../agent/param/prometheus/Oauth2.java | 2 +- .../param/prometheus/PrometheusConfig.java | 2 +- .../param/prometheus/Relabel_configs.java | 2 +- .../agent/param/prometheus/Remote_read.java | 2 +- .../agent/param/prometheus/Remote_write.java | 2 +- .../param/prometheus/Scrape_configs.java | 2 +- .../param/prometheus/Static_configs.java | 2 +- .../agent/param/prometheus/Tls_config.java | 2 +- .../prometheus/Write_relabel_configs.java | 2 +- .../agent/param/prometheus/ali/AliLabel.java | 2 +- .../prometheus/ali/AliNotifyObjects.java | 2 +- .../param/prometheus/ali/AliNotifyRule.java | 2 +- .../param/prometheus/ali/Scrape_configs.java | 4 +-- .../scrapeConfig/ScrapeConfigDetail.java | 12 +++---- .../param/scrapeConfig/ScrapeConfigParam.java | 14 ++++---- .../param/scrapeConfig/StaticConfigs.java | 2 +- .../prometheus/agent/result/Result.java | 4 +-- .../alertManager/AlertManagerFireResult.java | 2 +- .../agent/result/alertManager/Alerts.java | 2 +- .../result/alertManager/Annotations.java | 2 +- .../alertManager/CommonAnnotations.java | 2 +- .../result/alertManager/CommonLabels.java | 2 +- .../result/alertManager/GroupLabels.java | 2 +- .../agent/result/alertManager/Labels.java | 2 +- .../prometheus/agent/util/CommitPoolUtil.java | 2 +- .../prometheus/agent/util/DateUtil.java | 2 +- .../prometheus/agent/util/FileUtil.java | 2 +- .../prometheus/agent/util/FreeMarkerUtil.java | 6 +--- .../ozhera}/prometheus/agent/util/Http.java | 2 +- .../prometheus/agent/util/MailUtil.java | 2 +- .../prometheus/agent/util/YamlUtil.java | 2 +- .../prometheus/agent/vo/PageDataVo.java | 2 +- .../prometheus/agent/test/CommonTest.java | 2 +- .../prometheus/agent/test/TimeTest.java | 4 +-- .../ozhera-prometheus-agent-dao/pom.xml | 4 +-- .../prometheus/agent/Impl/BaseDao.java | 2 +- .../prometheus/agent/Impl/RuleAlertDao.java | 6 ++-- .../agent/Impl/ScrapeConfigDao.java | 8 ++--- .../prometheus/agent/Impl/SilenceDao.java | 4 +-- .../prometheus/agent/config/DaoConfig.java | 2 +- .../agent/entity/RuleAlertEntity.java | 2 +- .../agent/entity/RuleSilenceEntity.java | 2 +- .../entity/RuleSilenceMatcherEntity.java | 2 +- .../agent/entity/ScrapeConfigEntity.java | 2 +- .../ozhera-prometheus-agent-server/pom.xml | 6 ++-- .../prometheus/agent/aop/ArgCheck.java | 2 +- .../prometheus/agent/aop/ArgCheckAspect.java | 10 +++--- .../bootstrap/PrometheusAgentBootstrap.java | 2 +- .../agent/config/CacheConfiguration.java | 2 +- .../agent/config/ClientConfiguration.java | 26 +++++++-------- .../agent/config/DataSourceConfiguration.java | 2 +- .../agent/config/DubboConfiguration.java | 2 +- .../agent/config/NacosConfiguration.java | 2 +- .../controller/PrometheusAlertController.java | 12 +++---- .../controller/PrometheusController.java | 8 ++--- .../PrometheusScrapeJobController.java | 12 +++---- .../PrometheusSilenceController.java | 12 +++---- .../controller/PrometheusVMController.java | 8 ++--- .../agent/test/AliPrometheusTest.java | 2 +- .../prometheus/agent/test/MailTest.java | 2 +- .../agent/test/RuleSilenceTest.java | 2 +- .../prometheus/agent/test/feishuTest.java | 2 +- .../ozhera-prometheus-agent-service/pom.xml | 4 +-- .../ozhera}/prometheus/agent/domain/Ips.java | 2 +- .../agent/service/DingDingService.java | 2 +- .../agent/service/FeishuService.java | 2 +- .../prometheus/agent/service/InitService.java | 2 +- .../agent/service/MioneMachineService.java | 8 ++--- .../agent/service/PrometheusIpService.java | 4 +-- .../agent/service/PrometheusVmService.java | 4 +-- .../alarmContact/BaseAlertContact.java | 8 ++--- .../alarmContact/DingAlertContact.java | 16 +++++----- .../alarmContact/FeishuAlertContact.java | 18 +++++------ .../alarmContact/MailAlertContact.java | 18 +++++------ .../api/MioneMachineServiceExtension.java | 4 +-- .../api/PrometheusIpServiceExtension.java | 4 +-- .../MioneMachineServiceExtensionImpl.java | 6 ++-- .../PrometheusIpServiceExtensionImpl.java | 6 ++-- .../dto/SilenceAlertManagerReqBuilder.java | 2 +- .../service/dto/dingding/SilenceCallBack.java | 2 +- .../service/dto/heraApp/GetAllPodIpRes.java | 2 +- .../service/impl/DingDingServiceImpl.java | 4 +-- .../agent/service/impl/FeishuServiceImpl.java | 4 +-- .../agent/service/impl/InitServiceImpl.java | 4 +-- .../service/impl/MioneMachineServiceImpl.java | 8 ++--- .../impl/PrometheusAlertServiceImpl.java | 14 ++++---- .../impl/PrometheusDubboServiceImpl.java | 10 +++--- .../service/impl/PrometheusIpServiceImpl.java | 10 +++--- .../service/impl/PrometheusScrapeJobImpl.java | 14 ++++---- .../service/impl/PrometheusVmServiceImpl.java | 6 ++-- .../service/prometheus/RuleAlertService.java | 26 +++++++-------- .../prometheus/RuleSilenceService.java | 32 +++++++++---------- .../service/prometheus/ScrapeJobService.java | 18 +++++------ .../prometheus/agent/test/DingDingTest.java | 2 +- .../prometheus/agent/test/feishuCartTest.java | 8 ++--- ozhera-prometheus-agent/pom.xml | 8 ++--- 147 files changed, 409 insertions(+), 417 deletions(-) rename ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/api/bo/PrometheusReq.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/api/bo/Result.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/api/service/PrometheusAlertService.java (85%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/api/service/PrometheusDubboService.java (82%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/api/service/PrometheusScrapeJobService.java (86%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/BaseClient.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/alertManagerClient/AlertManagerAliClient.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/alertManagerClient/AlertManagerClient.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/alertManagerClient/AlertManagerVMClient.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/client/Client.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/operators/BasicOperator.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/operators/ali/AliAlertMessageTemplate.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/operators/ali/AliPrometheusOperator.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/operators/local/LocalPrometheusOperator.java (87%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/operators/vm/VMPrometheusOperator.java (87%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/prometheusClient/PrometheusAliClient.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/prometheusClient/PrometheusClient.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/prometheusClient/PrometheusVMClient.java (91%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/Commons.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/enums/Base.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/enums/ClientType.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/enums/ErrorCode.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/enums/RuleAlertStatusEnum.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/enums/RuleSilenceStatusEnum.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/enums/ScrapeJobStatusEnum.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/ArgCheck.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/BaseParam.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alert/AMSilence.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alert/AMSilenceResponse.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alert/AMSilenceStatus.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alert/Matcher.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alert/RuleAlertParam.java (91%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alert/RuleSilenceParam.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alertManager/AlertManagerConfig.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alertManager/Group.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/alertManager/Rule.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Alert_static_config.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Alerting.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Alertmanagers.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Authorization.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/BasicAuth.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/External_labels.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/File_sd_configs.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Global.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Http_sd_configs.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Metric_relabel_configs.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Oauth2.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/PrometheusConfig.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Relabel_configs.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Remote_read.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Remote_write.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Scrape_configs.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Static_configs.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Tls_config.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/Write_relabel_configs.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/ali/AliLabel.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/ali/AliNotifyRule.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/prometheus/ali/Scrape_configs.java (88%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java (78%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java (77%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/param/scrapeConfig/StaticConfigs.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/Result.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/AlertManagerFireResult.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/Alerts.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/Annotations.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/CommonAnnotations.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/CommonLabels.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/GroupLabels.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/result/alertManager/Labels.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/CommitPoolUtil.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/DateUtil.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/FileUtil.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/FreeMarkerUtil.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/Http.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/MailUtil.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/util/YamlUtil.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/vo/PageDataVo.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/CommonTest.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/TimeTest.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/Impl/BaseDao.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/Impl/RuleAlertDao.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/Impl/ScrapeConfigDao.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/Impl/SilenceDao.java (89%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/config/DaoConfig.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/entity/RuleAlertEntity.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/entity/RuleSilenceEntity.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/entity/RuleSilenceMatcherEntity.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/entity/ScrapeConfigEntity.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/aop/ArgCheck.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/aop/ArgCheckAspect.java (91%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/config/CacheConfiguration.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/config/ClientConfiguration.java (76%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/config/DataSourceConfiguration.java (98%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/config/DubboConfiguration.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/config/NacosConfiguration.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/controller/PrometheusAlertController.java (91%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/controller/PrometheusController.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/controller/PrometheusScrapeJobController.java (88%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/controller/PrometheusSilenceController.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/controller/PrometheusVMController.java (91%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/AliPrometheusTest.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/MailTest.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/RuleSilenceTest.java (97%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/feishuTest.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/domain/Ips.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/DingDingService.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/FeishuService.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/InitService.java (92%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/MioneMachineService.java (68%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/PrometheusIpService.java (89%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/PrometheusVmService.java (88%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/alarmContact/BaseAlertContact.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/alarmContact/DingAlertContact.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/alarmContact/FeishuAlertContact.java (89%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/alarmContact/MailAlertContact.java (89%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/api/MioneMachineServiceExtension.java (87%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/api/PrometheusIpServiceExtension.java (89%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java (86%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java (95%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/dto/dingding/SilenceCallBack.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/DingDingServiceImpl.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/FeishuServiceImpl.java (96%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/InitServiceImpl.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/MioneMachineServiceImpl.java (82%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java (87%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java (80%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/PrometheusIpServiceImpl.java (91%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java (84%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/impl/PrometheusVmServiceImpl.java (94%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/prometheus/RuleAlertService.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/prometheus/RuleSilenceService.java (88%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/service/prometheus/ScrapeJobService.java (93%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/DingDingTest.java (99%) rename ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/{com/xiaomi/youpin => org/apache/ozhera}/prometheus/agent/test/feishuCartTest.java (98%) diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/alertmanager/impl/AlertManagerImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/alertmanager/impl/AlertManagerImpl.java index 753549bef..8b785e545 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/alertmanager/impl/AlertManagerImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/alertmanager/impl/AlertManagerImpl.java @@ -31,8 +31,8 @@ import com.xiaomi.mone.tpc.common.vo.UserVo; import com.xiaomi.mone.tpc.login.util.UserUtil; import com.xiaomi.mone.tpc.login.vo.AuthUserVo; -import com.xiaomi.youpin.prometheus.agent.api.service.PrometheusAlertService; -import com.xiaomi.youpin.prometheus.agent.param.alert.RuleAlertParam; +import org.apache.ozhera.prometheus.agent.api.service.PrometheusAlertService; +import org.apache.ozhera.prometheus.agent.param.alert.RuleAlertParam; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Reference; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -66,7 +66,7 @@ public Result addRule(JsonObject param,String identifyId, String user) { Result result = null; try { RuleAlertParam ruleAlertParam = new Gson().fromJson(new Gson().toJson(param), RuleAlertParam.class); - com.xiaomi.youpin.prometheus.agent.result.Result ruleAlert = prometheusAlertService.createRuleAlert(ruleAlertParam); + org.apache.ozhera.prometheus.agent.result.Result ruleAlert = prometheusAlertService.createRuleAlert(ruleAlertParam); result = new Gson().fromJson(new Gson().toJson(ruleAlert), Result.class); log.info("open alert add, request : {} ,result:{}",new Gson().toJson(ruleAlertParam),new Gson().toJson(ruleAlert)); @@ -84,7 +84,7 @@ public Result editRule(Integer alertId,JsonObject param,String identifyId, Stri log.info("open alert update api param :{}",param.toString()); try { RuleAlertParam ruleAlertParam = new Gson().fromJson(new Gson().toJson(param), RuleAlertParam.class); - com.xiaomi.youpin.prometheus.agent.result.Result ruleAlert = prometheusAlertService.UpdateRuleAlert(String.valueOf(alertId),ruleAlertParam); + org.apache.ozhera.prometheus.agent.result.Result ruleAlert = prometheusAlertService.UpdateRuleAlert(String.valueOf(alertId),ruleAlertParam); result = new Gson().fromJson(new Gson().toJson(ruleAlert), Result.class); log.info("open alert update request,alertId:{}, param : {} ,result:{}",alertId,new Gson().toJson(ruleAlertParam),new Gson().toJson(ruleAlert)); @@ -100,7 +100,7 @@ public Result delRule(Integer alertId,String identifyId, String user) { Result result = null; try { - com.xiaomi.youpin.prometheus.agent.result.Result ruleAlert = prometheusAlertService.DeleteRuleAlert(String.valueOf(alertId)); + org.apache.ozhera.prometheus.agent.result.Result ruleAlert = prometheusAlertService.DeleteRuleAlert(String.valueOf(alertId)); result = new Gson().fromJson(new Gson().toJson(ruleAlert), Result.class); log.info("open alert delete request,alertId:{}, result:{}",alertId,new Gson().toJson(ruleAlert)); @@ -116,7 +116,7 @@ public Result enableRule(Integer alertId,Integer pauseStatus,String identifyId, Result result = null; try { - com.xiaomi.youpin.prometheus.agent.result.Result ruleAlert = prometheusAlertService.EnabledRuleAlert(String.valueOf(alertId),String.valueOf(pauseStatus)); + org.apache.ozhera.prometheus.agent.result.Result ruleAlert = prometheusAlertService.EnabledRuleAlert(String.valueOf(alertId),String.valueOf(pauseStatus)); result = new Gson().fromJson(new Gson().toJson(ruleAlert), Result.class); log.info("open alert enableRule request,alertId:{}, pauseStatus:{},result:{}",alertId,pauseStatus,new Gson().toJson(ruleAlert)); diff --git a/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/scrapeJob/impl/ScrapeJobImpl.java b/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/scrapeJob/impl/ScrapeJobImpl.java index 89ecda048..b5a48601b 100644 --- a/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/scrapeJob/impl/ScrapeJobImpl.java +++ b/ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/scrapeJob/impl/ScrapeJobImpl.java @@ -19,8 +19,8 @@ import com.google.gson.JsonObject; import org.apache.ozhera.monitor.result.Result; import org.apache.ozhera.monitor.service.scrapeJob.ScrapeJob; -import com.xiaomi.youpin.prometheus.agent.api.service.PrometheusScrapeJobService; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; +import org.apache.ozhera.prometheus.agent.api.service.PrometheusScrapeJobService; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Value; @@ -42,7 +42,7 @@ public Result addScrapeJob(JsonObject param, String identifyId, String user) { Result result = null; try { ScrapeConfigParam scrapeConfigParam = new Gson().fromJson(new Gson().toJson(param), ScrapeConfigParam.class); - com.xiaomi.youpin.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.CreateScrapeConfig(scrapeConfigParam); + org.apache.ozhera.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.CreateScrapeConfig(scrapeConfigParam); log.info("addScrapeJob: {}", scrapeResult); result = new Gson().fromJson(new Gson().toJson(scrapeResult), Result.class); @@ -58,7 +58,7 @@ public Result editScrapeJob(Integer jobId, JsonObject param, String identifyId, Result result = null; try { ScrapeConfigParam scrapeConfigParam = new Gson().fromJson(new Gson().toJson(param), ScrapeConfigParam.class); - com.xiaomi.youpin.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.UpdateScrapeConfig(String.valueOf(jobId), scrapeConfigParam); + org.apache.ozhera.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.UpdateScrapeConfig(String.valueOf(jobId), scrapeConfigParam); log.info("editScrapeJob: {}", scrapeResult); result = new Gson().fromJson(new Gson().toJson(scrapeResult), Result.class); log.info("open scrape job edit, request : {} ,result:{}", new Gson().toJson(scrapeConfigParam), new Gson().toJson(scrapeResult)); @@ -72,7 +72,7 @@ public Result editScrapeJob(Integer jobId, JsonObject param, String identifyId, public Result delScrapeJob(Integer jobId, String identifyId, String user) { Result result = null; try { - com.xiaomi.youpin.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.DeleteScrapeConfig(String.valueOf(jobId)); + org.apache.ozhera.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.DeleteScrapeConfig(String.valueOf(jobId)); log.info("delScrapeJob: {}", scrapeResult); result = new Gson().fromJson(new Gson().toJson(scrapeResult), Result.class); log.info("open scrape job delete, request : {} ,result:{}", jobId, new Gson().toJson(scrapeResult)); @@ -86,7 +86,7 @@ public Result delScrapeJob(Integer jobId, String identifyId, String user) { public Result queryScrapeJob(Integer jobId, String identifyId, String user) { Result result = null; try { - com.xiaomi.youpin.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.GetScrapeConfig(String.valueOf(jobId)); + org.apache.ozhera.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.GetScrapeConfig(String.valueOf(jobId)); log.info("queryScrapeJob: {}", scrapeResult); result = new Gson().fromJson(new Gson().toJson(scrapeResult), Result.class); log.info("open scrape job query, request : {} ,result:{}", jobId, new Gson().toJson(scrapeResult)); @@ -100,7 +100,7 @@ public Result queryScrapeJob(Integer jobId, String identifyId, String user) { public Result queryScrapeJobByName(String name, String identifyId, String user) { Result result = null; try { - com.xiaomi.youpin.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.GetScrapeConfigByName(name); + org.apache.ozhera.prometheus.agent.result.Result scrapeResult = prometheusScrapeJobService.GetScrapeConfigByName(name); log.info("queryScrapeJobByName: {}", scrapeResult); result = new Gson().fromJson(new Gson().toJson(scrapeResult), Result.class); log.info("open scrape job query, request : {} ,result:{}", name, new Gson().toJson(scrapeResult)); diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml index 04a3a760d..348ceb386 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-prometheus-agent - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/bo/PrometheusReq.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/bo/PrometheusReq.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/bo/PrometheusReq.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/bo/PrometheusReq.java index eb1133964..742a7d77a 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/bo/PrometheusReq.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/bo/PrometheusReq.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.api.bo; +package org.apache.ozhera.prometheus.agent.api.bo; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/bo/Result.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/bo/Result.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/bo/Result.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/bo/Result.java index 8153e2996..0f67e3492 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/bo/Result.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/bo/Result.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.api.bo; +package org.apache.ozhera.prometheus.agent.api.bo; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusAlertService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusAlertService.java similarity index 85% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusAlertService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusAlertService.java index d25ff5718..ee146b823 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusAlertService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusAlertService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.api.service; +package org.apache.ozhera.prometheus.agent.api.service; -import com.xiaomi.youpin.prometheus.agent.param.alert.RuleAlertParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.param.alert.RuleAlertParam; +import org.apache.ozhera.prometheus.agent.result.Result; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusDubboService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusDubboService.java similarity index 82% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusDubboService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusDubboService.java index 59df5eb16..00aa73f71 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusDubboService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusDubboService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.api.service; +package org.apache.ozhera.prometheus.agent.api.service; -import com.xiaomi.youpin.prometheus.agent.api.bo.PrometheusReq; -import com.xiaomi.youpin.prometheus.agent.api.bo.Result; +import org.apache.ozhera.prometheus.agent.api.bo.PrometheusReq; +import org.apache.ozhera.prometheus.agent.api.bo.Result; import java.util.Set; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusScrapeJobService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusScrapeJobService.java similarity index 86% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusScrapeJobService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusScrapeJobService.java index 72822e0e3..57878b7d4 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/com/xiaomi/youpin/prometheus/agent/api/service/PrometheusScrapeJobService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/src/main/java/org/apache/ozhera/prometheus/agent/api/service/PrometheusScrapeJobService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.api.service; +package org.apache.ozhera.prometheus.agent.api.service; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; +import org.apache.ozhera.prometheus.agent.result.Result; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml index 1cd6a839b..c094997a3 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-prometheus-agent - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/BaseClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/BaseClient.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/BaseClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/BaseClient.java index 223b8b92e..a210e04e3 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/BaseClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/BaseClient.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent; +package org.apache.ozhera.prometheus.agent; -import com.xiaomi.youpin.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.client.Client; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerAliClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerAliClient.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerAliClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerAliClient.java index b1bdd99b6..065d0bf91 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerAliClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerAliClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.alertManagerClient; +package org.apache.ozhera.prometheus.agent.alertManagerClient; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.aliyun.arms20190808.models.CreateOrUpdateAlertRuleResponse; @@ -27,15 +27,15 @@ import com.aliyun.arms20190808.models.ListNotificationPoliciesResponseBody; import com.google.common.base.Stopwatch; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.enums.RuleAlertStatusEnum; -import com.xiaomi.youpin.prometheus.agent.operators.ali.AliPrometheusOperator; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.Rule; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.AliNotifyObjects; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.AliNotifyRule; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.RuleAlertService; -import com.xiaomi.youpin.prometheus.agent.util.CommitPoolUtil; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.enums.RuleAlertStatusEnum; +import org.apache.ozhera.prometheus.agent.operators.ali.AliPrometheusOperator; +import org.apache.ozhera.prometheus.agent.param.alertManager.Rule; +import org.apache.ozhera.prometheus.agent.param.prometheus.ali.AliNotifyObjects; +import org.apache.ozhera.prometheus.agent.param.prometheus.ali.AliNotifyRule; +import org.apache.ozhera.prometheus.agent.service.prometheus.RuleAlertService; +import org.apache.ozhera.prometheus.agent.util.CommitPoolUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerClient.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerClient.java index 945156ace..1657c12b5 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerClient.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.alertManagerClient; +package org.apache.ozhera.prometheus.agent.alertManagerClient; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.base.Stopwatch; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.AlertManagerConfig; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.Group; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.Rule; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.RuleAlertService; -import com.xiaomi.youpin.prometheus.agent.util.CommitPoolUtil; -import com.xiaomi.youpin.prometheus.agent.util.FileUtil; -import com.xiaomi.youpin.prometheus.agent.util.Http; -import com.xiaomi.youpin.prometheus.agent.util.YamlUtil; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.param.alertManager.AlertManagerConfig; +import org.apache.ozhera.prometheus.agent.param.alertManager.Group; +import org.apache.ozhera.prometheus.agent.param.alertManager.Rule; +import org.apache.ozhera.prometheus.agent.service.prometheus.RuleAlertService; +import org.apache.ozhera.prometheus.agent.util.CommitPoolUtil; +import org.apache.ozhera.prometheus.agent.util.FileUtil; +import org.apache.ozhera.prometheus.agent.util.Http; +import org.apache.ozhera.prometheus.agent.util.YamlUtil; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import static com.xiaomi.youpin.prometheus.agent.Commons.HTTP_POST; +import static org.apache.ozhera.prometheus.agent.Commons.HTTP_POST; @Slf4j public class AlertManagerClient implements Client { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerVMClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerVMClient.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerVMClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerVMClient.java index a3f29e555..98f4d9d37 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/alertManagerClient/AlertManagerVMClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/alertManagerClient/AlertManagerVMClient.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.alertManagerClient; +package org.apache.ozhera.prometheus.agent.alertManagerClient; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.base.Stopwatch; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.AlertManagerConfig; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.Group; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.Rule; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.RuleAlertService; -import com.xiaomi.youpin.prometheus.agent.util.CommitPoolUtil; -import com.xiaomi.youpin.prometheus.agent.util.FileUtil; -import com.xiaomi.youpin.prometheus.agent.util.Http; -import com.xiaomi.youpin.prometheus.agent.util.YamlUtil; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.param.alertManager.AlertManagerConfig; +import org.apache.ozhera.prometheus.agent.param.alertManager.Group; +import org.apache.ozhera.prometheus.agent.param.alertManager.Rule; +import org.apache.ozhera.prometheus.agent.service.prometheus.RuleAlertService; +import org.apache.ozhera.prometheus.agent.util.CommitPoolUtil; +import org.apache.ozhera.prometheus.agent.util.FileUtil; +import org.apache.ozhera.prometheus.agent.util.Http; +import org.apache.ozhera.prometheus.agent.util.YamlUtil; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import static com.xiaomi.youpin.prometheus.agent.Commons.HTTP_GET; +import static org.apache.ozhera.prometheus.agent.Commons.HTTP_GET; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/client/Client.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/client/Client.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/client/Client.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/client/Client.java index 9bfb0412f..5de739aa0 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/client/Client.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/client/Client.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.client; +package org.apache.ozhera.prometheus.agent.client; public interface Client { public void GetLocalConfigs(); diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/BasicOperator.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/BasicOperator.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/BasicOperator.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/BasicOperator.java index 75c0668f0..c56d10445 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/BasicOperator.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/BasicOperator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.operators; +package org.apache.ozhera.prometheus.agent.operators; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/ali/AliAlertMessageTemplate.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/ali/AliAlertMessageTemplate.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/ali/AliAlertMessageTemplate.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/ali/AliAlertMessageTemplate.java index c1c7d39e7..e60b68c68 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/ali/AliAlertMessageTemplate.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/ali/AliAlertMessageTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.operators.ali; +package org.apache.ozhera.prometheus.agent.operators.ali; public class AliAlertMessageTemplate { public static final String ALERT_MESSAGE_TEMPLATE = "{\n" + diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/ali/AliPrometheusOperator.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/ali/AliPrometheusOperator.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/ali/AliPrometheusOperator.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/ali/AliPrometheusOperator.java index 9adedef8d..50834e9ce 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/ali/AliPrometheusOperator.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/ali/AliPrometheusOperator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.operators.ali; +package org.apache.ozhera.prometheus.agent.operators.ali; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.aliyun.arms20190808.Client; @@ -49,9 +49,9 @@ import com.aliyun.teaopenapi.models.Config; import com.aliyun.teautil.models.RuntimeOptions; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.operators.BasicOperator; -import com.xiaomi.youpin.prometheus.agent.param.alertManager.Rule; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.AliLabel; +import org.apache.ozhera.prometheus.agent.operators.BasicOperator; +import org.apache.ozhera.prometheus.agent.param.alertManager.Rule; +import org.apache.ozhera.prometheus.agent.param.prometheus.ali.AliLabel; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -60,7 +60,7 @@ import java.util.List; import java.util.Map; -import static com.xiaomi.youpin.prometheus.agent.operators.ali.AliAlertMessageTemplate.ALERT_MESSAGE_TEMPLATE; +import static org.apache.ozhera.prometheus.agent.operators.ali.AliAlertMessageTemplate.ALERT_MESSAGE_TEMPLATE; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/local/LocalPrometheusOperator.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/local/LocalPrometheusOperator.java similarity index 87% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/local/LocalPrometheusOperator.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/local/LocalPrometheusOperator.java index 8d2583a50..165462d24 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/local/LocalPrometheusOperator.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/local/LocalPrometheusOperator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.operators.local; +package org.apache.ozhera.prometheus.agent.operators.local; -import com.xiaomi.youpin.prometheus.agent.operators.BasicOperator; +import org.apache.ozhera.prometheus.agent.operators.BasicOperator; import lombok.extern.slf4j.Slf4j; /** diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/vm/VMPrometheusOperator.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/vm/VMPrometheusOperator.java similarity index 87% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/vm/VMPrometheusOperator.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/vm/VMPrometheusOperator.java index ed0b719c1..d6f95c9d4 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/operators/vm/VMPrometheusOperator.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/operators/vm/VMPrometheusOperator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.operators.vm; +package org.apache.ozhera.prometheus.agent.operators.vm; -import com.xiaomi.youpin.prometheus.agent.operators.BasicOperator; +import org.apache.ozhera.prometheus.agent.operators.BasicOperator; /** * @author zhangxiaowei6 * @Date 2024/2/6 09:45 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusAliClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusAliClient.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusAliClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusAliClient.java index e056e4998..2a57767d0 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusAliClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusAliClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.prometheusClient; +package org.apache.ozhera.prometheus.agent.prometheusClient; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.aliyun.arms20190808.models.CreateEnvCustomJobResponse; @@ -26,15 +26,15 @@ import com.aliyun.arms20190808.models.UpdateEnvCustomJobResponse; import com.google.common.base.Stopwatch; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.entity.ScrapeConfigEntity; -import com.xiaomi.youpin.prometheus.agent.enums.ScrapeJobStatusEnum; -import com.xiaomi.youpin.prometheus.agent.operators.ali.AliPrometheusOperator; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Scrape_configs; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.ScrapeJobService; -import com.xiaomi.youpin.prometheus.agent.util.CommitPoolUtil; -import com.xiaomi.youpin.prometheus.agent.util.YamlUtil; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.entity.ScrapeConfigEntity; +import org.apache.ozhera.prometheus.agent.enums.ScrapeJobStatusEnum; +import org.apache.ozhera.prometheus.agent.operators.ali.AliPrometheusOperator; +import org.apache.ozhera.prometheus.agent.param.prometheus.Scrape_configs; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; +import org.apache.ozhera.prometheus.agent.service.prometheus.ScrapeJobService; +import org.apache.ozhera.prometheus.agent.util.CommitPoolUtil; +import org.apache.ozhera.prometheus.agent.util.YamlUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -289,7 +289,7 @@ private void createOrUpdateAliPrometheusJobV2() { //create job from db localConfigs.forEach(config -> { String initJobName = config.getJob_name(); - com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.Scrape_configs aliConfig = new com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.Scrape_configs(); + org.apache.ozhera.prometheus.agent.param.prometheus.ali.Scrape_configs aliConfig = new org.apache.ozhera.prometheus.agent.param.prometheus.ali.Scrape_configs(); CopyOnWriteArrayList confList = new CopyOnWriteArrayList<>(); confList.add(config); aliConfig.setScrape_configs(confList); @@ -313,7 +313,7 @@ private void innerCreateOrUpdateJob(boolean isFirst, String jobName, List { String initJobName = config.getJob_name(); - com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.Scrape_configs aliConfig = new com.xiaomi.youpin.prometheus.agent.param.prometheus.ali.Scrape_configs(); + org.apache.ozhera.prometheus.agent.param.prometheus.ali.Scrape_configs aliConfig = new org.apache.ozhera.prometheus.agent.param.prometheus.ali.Scrape_configs(); CopyOnWriteArrayList confList = new CopyOnWriteArrayList<>(); confList.add(config); aliConfig.setScrape_configs(confList); @@ -329,7 +329,7 @@ private void innerCreateOrUpdateJob(boolean isFirst, String jobName, List confList = new CopyOnWriteArrayList<>(); confList.add(localConfigByJobName); aliConfig.setScrape_configs(confList); @@ -345,7 +345,7 @@ private void innerCreateOrUpdateJob(boolean isFirst, String jobName, List confList = new CopyOnWriteArrayList<>(); confList.add(localConfigByJobName); aliConfig.setScrape_configs(confList); diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusClient.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusClient.java index 4b4c34a49..f7744b71d 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusClient.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.prometheusClient; +package org.apache.ozhera.prometheus.agent.prometheusClient; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.base.Stopwatch; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.entity.ScrapeConfigEntity; -import com.xiaomi.youpin.prometheus.agent.enums.ScrapeJobStatusEnum; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.PrometheusConfig; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Scrape_configs; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.ScrapeJobService; -import com.xiaomi.youpin.prometheus.agent.util.CommitPoolUtil; -import com.xiaomi.youpin.prometheus.agent.util.FileUtil; -import com.xiaomi.youpin.prometheus.agent.util.Http; -import com.xiaomi.youpin.prometheus.agent.util.YamlUtil; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.entity.ScrapeConfigEntity; +import org.apache.ozhera.prometheus.agent.enums.ScrapeJobStatusEnum; +import org.apache.ozhera.prometheus.agent.param.prometheus.PrometheusConfig; +import org.apache.ozhera.prometheus.agent.param.prometheus.Scrape_configs; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; +import org.apache.ozhera.prometheus.agent.service.prometheus.ScrapeJobService; +import org.apache.ozhera.prometheus.agent.util.CommitPoolUtil; +import org.apache.ozhera.prometheus.agent.util.FileUtil; +import org.apache.ozhera.prometheus.agent.util.Http; +import org.apache.ozhera.prometheus.agent.util.YamlUtil; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -41,8 +41,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import static com.xiaomi.youpin.prometheus.agent.Commons.HTTP_GET; -import static com.xiaomi.youpin.prometheus.agent.Commons.HTTP_POST; +import static org.apache.ozhera.prometheus.agent.Commons.HTTP_GET; +import static org.apache.ozhera.prometheus.agent.Commons.HTTP_POST; @Slf4j public class PrometheusClient implements Client { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusVMClient.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusVMClient.java similarity index 91% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusVMClient.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusVMClient.java index 7c5ece86b..8b70be01a 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/com/xiaomi/youpin/prometheus/agent/prometheusClient/PrometheusVMClient.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/src/main/java/org/apache/ozhera/prometheus/agent/prometheusClient/PrometheusVMClient.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.prometheusClient; +package org.apache.ozhera.prometheus.agent.prometheusClient; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.base.Stopwatch; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.entity.ScrapeConfigEntity; -import com.xiaomi.youpin.prometheus.agent.enums.ScrapeJobStatusEnum; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Scrape_configs; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.ScrapeJobService; -import com.xiaomi.youpin.prometheus.agent.util.CommitPoolUtil; -import com.xiaomi.youpin.prometheus.agent.util.FileUtil; -import com.xiaomi.youpin.prometheus.agent.util.Http; -import com.xiaomi.youpin.prometheus.agent.util.YamlUtil; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.entity.ScrapeConfigEntity; +import org.apache.ozhera.prometheus.agent.enums.ScrapeJobStatusEnum; +import org.apache.ozhera.prometheus.agent.param.prometheus.Scrape_configs; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; +import org.apache.ozhera.prometheus.agent.service.prometheus.ScrapeJobService; +import org.apache.ozhera.prometheus.agent.util.CommitPoolUtil; +import org.apache.ozhera.prometheus.agent.util.FileUtil; +import org.apache.ozhera.prometheus.agent.util.Http; +import org.apache.ozhera.prometheus.agent.util.YamlUtil; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; @@ -42,7 +42,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import static com.xiaomi.youpin.prometheus.agent.Commons.HTTP_GET; +import static org.apache.ozhera.prometheus.agent.Commons.HTTP_GET; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml index 71ead5e5a..39bfe7ab4 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-prometheus-agent - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/Commons.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/Commons.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/Commons.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/Commons.java index dc42e8428..122e4e6d3 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/Commons.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/Commons.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent; +package org.apache.ozhera.prometheus.agent; public class Commons { public static final Integer COMMON_PAGE_SIZE = 10; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/Base.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/Base.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/Base.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/Base.java index a22b69a34..caaed4d2e 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/Base.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/Base.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.enums; +package org.apache.ozhera.prometheus.agent.enums; public interface Base { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ClientType.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ClientType.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ClientType.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ClientType.java index 7e855eac7..e69760528 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ClientType.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ClientType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.enums; +package org.apache.ozhera.prometheus.agent.enums; public enum ClientType implements Base{ diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ErrorCode.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ErrorCode.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ErrorCode.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ErrorCode.java index 9e26615ae..433f1d917 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ErrorCode.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ErrorCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.enums; +package org.apache.ozhera.prometheus.agent.enums; public enum ErrorCode { success(0, "success"), diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/RuleAlertStatusEnum.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/RuleAlertStatusEnum.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/RuleAlertStatusEnum.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/RuleAlertStatusEnum.java index 877208d2b..165e39bde 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/RuleAlertStatusEnum.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/RuleAlertStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.enums; +package org.apache.ozhera.prometheus.agent.enums; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/RuleSilenceStatusEnum.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/RuleSilenceStatusEnum.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/RuleSilenceStatusEnum.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/RuleSilenceStatusEnum.java index 7980f8673..6b913a837 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/RuleSilenceStatusEnum.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/RuleSilenceStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.enums; +package org.apache.ozhera.prometheus.agent.enums; public enum RuleSilenceStatusEnum implements Base { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ScrapeJobStatusEnum.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ScrapeJobStatusEnum.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ScrapeJobStatusEnum.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ScrapeJobStatusEnum.java index bd1ef30a6..23c62f87c 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/enums/ScrapeJobStatusEnum.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/enums/ScrapeJobStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.enums; +package org.apache.ozhera.prometheus.agent.enums; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/ArgCheck.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/ArgCheck.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/ArgCheck.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/ArgCheck.java index 0a109fe09..f9ec98dc9 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/ArgCheck.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/ArgCheck.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param; +package org.apache.ozhera.prometheus.agent.param; public interface ArgCheck { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/BaseParam.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/BaseParam.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/BaseParam.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/BaseParam.java index 82b1e93ff..d740b0538 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/BaseParam.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/BaseParam.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param; +package org.apache.ozhera.prometheus.agent.param; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilence.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilence.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilence.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilence.java index 949655a61..cc747e042 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilence.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilence.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alert; +package org.apache.ozhera.prometheus.agent.param.alert; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilenceResponse.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilenceResponse.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilenceResponse.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilenceResponse.java index fffbc4ee4..1827ab5f1 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilenceResponse.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilenceResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alert; +package org.apache.ozhera.prometheus.agent.param.alert; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilenceStatus.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilenceStatus.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilenceStatus.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilenceStatus.java index 94a5900c9..5c2bf6ea3 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/AMSilenceStatus.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/AMSilenceStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alert; +package org.apache.ozhera.prometheus.agent.param.alert; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/Matcher.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/Matcher.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/Matcher.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/Matcher.java index 6c545987d..5268902aa 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/Matcher.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/Matcher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alert; +package org.apache.ozhera.prometheus.agent.param.alert; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/RuleAlertParam.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/RuleAlertParam.java similarity index 91% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/RuleAlertParam.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/RuleAlertParam.java index a1731c8b5..0bb6b4c62 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/RuleAlertParam.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/RuleAlertParam.java @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alert; -import com.xiaomi.youpin.prometheus.agent.param.BaseParam; +package org.apache.ozhera.prometheus.agent.param.alert; +import org.apache.ozhera.prometheus.agent.param.BaseParam; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/RuleSilenceParam.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/RuleSilenceParam.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/RuleSilenceParam.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/RuleSilenceParam.java index f9280bad9..62251d9f7 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alert/RuleSilenceParam.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alert/RuleSilenceParam.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alert; +package org.apache.ozhera.prometheus.agent.param.alert; -import com.xiaomi.youpin.prometheus.agent.param.BaseParam; +import org.apache.ozhera.prometheus.agent.param.BaseParam; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/AlertManagerConfig.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/AlertManagerConfig.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/AlertManagerConfig.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/AlertManagerConfig.java index 319b1f274..47ce1f22d 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/AlertManagerConfig.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/AlertManagerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alertManager; +package org.apache.ozhera.prometheus.agent.param.alertManager; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/Group.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/Group.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/Group.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/Group.java index b2997b761..094a25e65 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/Group.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/Group.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alertManager; +package org.apache.ozhera.prometheus.agent.param.alertManager; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/Rule.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/Rule.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/Rule.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/Rule.java index 24aff3f37..d7bd2e534 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/alertManager/Rule.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/alertManager/Rule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.alertManager; +package org.apache.ozhera.prometheus.agent.param.alertManager; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alert_static_config.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alert_static_config.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alert_static_config.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alert_static_config.java index 733aa6aa4..74c0ada22 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alert_static_config.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alert_static_config.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alerting.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alerting.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alerting.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alerting.java index 3beba4167..e01782667 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alerting.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alerting.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alertmanagers.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alertmanagers.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alertmanagers.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alertmanagers.java index c39dec61b..566e92957 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Alertmanagers.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Alertmanagers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Authorization.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Authorization.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Authorization.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Authorization.java index d48d4af50..47f00a348 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Authorization.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Authorization.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/BasicAuth.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/BasicAuth.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/BasicAuth.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/BasicAuth.java index cee32a474..75c43cde7 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/BasicAuth.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/BasicAuth.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/External_labels.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/External_labels.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/External_labels.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/External_labels.java index 9ca39e19a..aa11c7c4a 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/External_labels.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/External_labels.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/File_sd_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/File_sd_configs.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/File_sd_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/File_sd_configs.java index 6a4ac4867..f54a97045 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/File_sd_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/File_sd_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Global.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Global.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Global.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Global.java index 1632ebd50..9102ce587 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Global.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Global.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Http_sd_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Http_sd_configs.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Http_sd_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Http_sd_configs.java index a5818ab82..72f1cb76a 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Http_sd_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Http_sd_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Metric_relabel_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Metric_relabel_configs.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Metric_relabel_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Metric_relabel_configs.java index 15d909c42..40f5397db 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Metric_relabel_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Metric_relabel_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Oauth2.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Oauth2.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Oauth2.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Oauth2.java index 54ab0c195..4c916abcf 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Oauth2.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Oauth2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/PrometheusConfig.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/PrometheusConfig.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/PrometheusConfig.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/PrometheusConfig.java index b068bba5f..367e57a8f 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/PrometheusConfig.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/PrometheusConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Relabel_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Relabel_configs.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Relabel_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Relabel_configs.java index 75b771693..8f6a80903 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Relabel_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Relabel_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Remote_read.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Remote_read.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Remote_read.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Remote_read.java index 17317baea..79c6363af 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Remote_read.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Remote_read.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Remote_write.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Remote_write.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Remote_write.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Remote_write.java index a1e56af22..588f498d8 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Remote_write.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Remote_write.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Scrape_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Scrape_configs.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Scrape_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Scrape_configs.java index 3a42b3423..570068295 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Scrape_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Scrape_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Static_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Static_configs.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Static_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Static_configs.java index bb97f035f..87aec63a4 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Static_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Static_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Tls_config.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Tls_config.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Tls_config.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Tls_config.java index f58387cff..72405a85c 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Tls_config.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Tls_config.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Write_relabel_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Write_relabel_configs.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Write_relabel_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Write_relabel_configs.java index fdcaa9a31..52e1de584 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/Write_relabel_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/Write_relabel_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus; +package org.apache.ozhera.prometheus.agent.param.prometheus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliLabel.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliLabel.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliLabel.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliLabel.java index cb67d59d1..bbb6a9380 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliLabel.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliLabel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus.ali; +package org.apache.ozhera.prometheus.agent.param.prometheus.ali; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java index 832489005..73e095d67 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliNotifyObjects.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus.ali; +package org.apache.ozhera.prometheus.agent.param.prometheus.ali; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliNotifyRule.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliNotifyRule.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliNotifyRule.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliNotifyRule.java index 4fdfaebca..1e193c3fd 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/AliNotifyRule.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/AliNotifyRule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus.ali; +package org.apache.ozhera.prometheus.agent.param.prometheus.ali; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/Scrape_configs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/Scrape_configs.java similarity index 88% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/Scrape_configs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/Scrape_configs.java index 9947e8ee6..98428f3e0 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/prometheus/ali/Scrape_configs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/prometheus/ali/Scrape_configs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.prometheus.ali; +package org.apache.ozhera.prometheus.agent.param.prometheus.ali; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -31,6 +31,6 @@ @Data public class Scrape_configs { - private List scrape_configs; + private List scrape_configs; } diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java similarity index 78% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java index 129b064d4..5306ce4dd 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/ScrapeConfigDetail.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.scrapeConfig; +package org.apache.ozhera.prometheus.agent.param.scrapeConfig; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.BasicAuth; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Http_sd_configs; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Metric_relabel_configs; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Relabel_configs; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Static_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.BasicAuth; +import org.apache.ozhera.prometheus.agent.param.prometheus.Http_sd_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.Metric_relabel_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.Relabel_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.Static_configs; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java similarity index 77% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java index fcaaf0806..bc6d530de 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/ScrapeConfigParam.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.scrapeConfig; +package org.apache.ozhera.prometheus.agent.param.scrapeConfig; -import com.xiaomi.youpin.prometheus.agent.param.BaseParam; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.BasicAuth; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Http_sd_configs; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Metric_relabel_configs; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Relabel_configs; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Static_configs; +import org.apache.ozhera.prometheus.agent.param.BaseParam; +import org.apache.ozhera.prometheus.agent.param.prometheus.BasicAuth; +import org.apache.ozhera.prometheus.agent.param.prometheus.Http_sd_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.Metric_relabel_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.Relabel_configs; +import org.apache.ozhera.prometheus.agent.param.prometheus.Static_configs; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/StaticConfigs.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/StaticConfigs.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/StaticConfigs.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/StaticConfigs.java index fe0c29134..65799174c 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/param/scrapeConfig/StaticConfigs.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/param/scrapeConfig/StaticConfigs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.param.scrapeConfig; +package org.apache.ozhera.prometheus.agent.param.scrapeConfig; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/Result.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/Result.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/Result.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/Result.java index 7914f00fe..693bbc8d0 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/Result.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/Result.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result; +package org.apache.ozhera.prometheus.agent.result; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; import java.io.Serializable; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/AlertManagerFireResult.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/AlertManagerFireResult.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/AlertManagerFireResult.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/AlertManagerFireResult.java index b2b5fd798..86ca5de93 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/AlertManagerFireResult.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/AlertManagerFireResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Alerts.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Alerts.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Alerts.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Alerts.java index 67246992d..81fde5a1b 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Alerts.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Alerts.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Annotations.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Annotations.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Annotations.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Annotations.java index 65b4e0277..4b425c976 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Annotations.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Annotations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/CommonAnnotations.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/CommonAnnotations.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/CommonAnnotations.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/CommonAnnotations.java index 60d195fbd..70be347c9 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/CommonAnnotations.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/CommonAnnotations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/CommonLabels.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/CommonLabels.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/CommonLabels.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/CommonLabels.java index 291ec47ad..914581749 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/CommonLabels.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/CommonLabels.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/GroupLabels.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/GroupLabels.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/GroupLabels.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/GroupLabels.java index 2271b774a..25c85f2bc 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/GroupLabels.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/GroupLabels.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Labels.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Labels.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Labels.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Labels.java index e0c979c25..9dce26126 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/result/alertManager/Labels.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/result/alertManager/Labels.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.result.alertManager; +package org.apache.ozhera.prometheus.agent.result.alertManager; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/CommitPoolUtil.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/CommitPoolUtil.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/CommitPoolUtil.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/CommitPoolUtil.java index ccd0a8c35..ce9b0e251 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/CommitPoolUtil.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/CommitPoolUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/DateUtil.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/DateUtil.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/DateUtil.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/DateUtil.java index 0ada84f1a..a33605b0b 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/DateUtil.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/DateUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/FileUtil.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/FileUtil.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/FileUtil.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/FileUtil.java index aa80a2b41..a00b280c4 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/FileUtil.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/FileUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import lombok.SneakyThrows; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/FreeMarkerUtil.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/FreeMarkerUtil.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/FreeMarkerUtil.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/FreeMarkerUtil.java index f3f27966b..1b9b56efd 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/FreeMarkerUtil.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/FreeMarkerUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import java.io.*; import java.util.HashMap; @@ -26,10 +26,6 @@ import freemarker.template.Template; import freemarker.template.TemplateException; -import java.io.*; -import java.util.HashMap; -import java.util.Map; - public class FreeMarkerUtil { /** * Get the template file under the specified directory. diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/Http.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/Http.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/Http.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/Http.java index 2b02d2a87..6eee58c1c 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/Http.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/Http.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/MailUtil.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/MailUtil.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/MailUtil.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/MailUtil.java index 151175015..a3c1ac650 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/MailUtil.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/MailUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import com.alibaba.nacos.api.config.annotation.NacosValue; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/YamlUtil.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/YamlUtil.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/YamlUtil.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/YamlUtil.java index 213072e45..44d69cb24 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/util/YamlUtil.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/util/YamlUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.util; +package org.apache.ozhera.prometheus.agent.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/vo/PageDataVo.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/vo/PageDataVo.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/vo/PageDataVo.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/vo/PageDataVo.java index 7a0360b13..92c8c280c 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/com/xiaomi/youpin/prometheus/agent/vo/PageDataVo.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/main/java/org/apache/ozhera/prometheus/agent/vo/PageDataVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.vo; +package org.apache.ozhera.prometheus.agent.vo; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/com/xiaomi/youpin/prometheus/agent/test/CommonTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/org/apache/ozhera/prometheus/agent/test/CommonTest.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/com/xiaomi/youpin/prometheus/agent/test/CommonTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/org/apache/ozhera/prometheus/agent/test/CommonTest.java index 8bf1990e3..0d1a04e9a 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/com/xiaomi/youpin/prometheus/agent/test/CommonTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/org/apache/ozhera/prometheus/agent/test/CommonTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; public class CommonTest { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/com/xiaomi/youpin/prometheus/agent/test/TimeTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/org/apache/ozhera/prometheus/agent/test/TimeTest.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/com/xiaomi/youpin/prometheus/agent/test/TimeTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/org/apache/ozhera/prometheus/agent/test/TimeTest.java index 48c113ec7..e3ed2fe24 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/com/xiaomi/youpin/prometheus/agent/test/TimeTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/src/test/java/org/apache/ozhera/prometheus/agent/test/TimeTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; -import com.xiaomi.youpin.prometheus.agent.util.DateUtil; +import org.apache.ozhera.prometheus.agent.util.DateUtil; import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml index 293a7943c..90a6f80bf 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-prometheus-agent - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/BaseDao.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/BaseDao.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/BaseDao.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/BaseDao.java index cd1129349..3c4276264 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/BaseDao.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/BaseDao.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.Impl; +package org.apache.ozhera.prometheus.agent.Impl; import org.nutz.dao.Dao; import org.nutz.dao.pager.Pager; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/RuleAlertDao.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/RuleAlertDao.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/RuleAlertDao.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/RuleAlertDao.java index 243f8b530..ffc24db89 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/RuleAlertDao.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/RuleAlertDao.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.Impl; +package org.apache.ozhera.prometheus.agent.Impl; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.enums.RuleAlertStatusEnum; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.enums.RuleAlertStatusEnum; import org.nutz.dao.Cnd; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.springframework.stereotype.Repository; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/ScrapeConfigDao.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/ScrapeConfigDao.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/ScrapeConfigDao.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/ScrapeConfigDao.java index 65180a474..c4a3d65e2 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/ScrapeConfigDao.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/ScrapeConfigDao.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.Impl; +package org.apache.ozhera.prometheus.agent.Impl; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.youpin.prometheus.agent.entity.ScrapeConfigEntity; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.enums.ScrapeJobStatusEnum; +import org.apache.ozhera.prometheus.agent.entity.ScrapeConfigEntity; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.enums.ScrapeJobStatusEnum; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.util.cri.SqlExpressionGroup; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/SilenceDao.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/SilenceDao.java similarity index 89% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/SilenceDao.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/SilenceDao.java index d033b5e70..38ba72069 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/Impl/SilenceDao.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/Impl/SilenceDao.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.Impl; +package org.apache.ozhera.prometheus.agent.Impl; -import com.xiaomi.youpin.prometheus.agent.entity.RuleSilenceEntity; +import org.apache.ozhera.prometheus.agent.entity.RuleSilenceEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DaoConfig.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/config/DaoConfig.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DaoConfig.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/config/DaoConfig.java index e80db321f..df79b8900 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DaoConfig.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/config/DaoConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.config; +package org.apache.ozhera.prometheus.agent.config; import org.nutz.dao.Dao; import org.nutz.dao.impl.NutDao; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleAlertEntity.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleAlertEntity.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleAlertEntity.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleAlertEntity.java index 91d2f7a9e..fb1d607b8 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleAlertEntity.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleAlertEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.entity; +package org.apache.ozhera.prometheus.agent.entity; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleSilenceEntity.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleSilenceEntity.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleSilenceEntity.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleSilenceEntity.java index 86f043c51..03061f096 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleSilenceEntity.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleSilenceEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.entity; +package org.apache.ozhera.prometheus.agent.entity; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleSilenceMatcherEntity.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleSilenceMatcherEntity.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleSilenceMatcherEntity.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleSilenceMatcherEntity.java index 055b4c6ad..a9c74cf6e 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/RuleSilenceMatcherEntity.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/RuleSilenceMatcherEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.entity; +package org.apache.ozhera.prometheus.agent.entity; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/ScrapeConfigEntity.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/ScrapeConfigEntity.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/ScrapeConfigEntity.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/ScrapeConfigEntity.java index adebc4e2e..026a0d777 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/com/xiaomi/youpin/prometheus/agent/entity/ScrapeConfigEntity.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/src/main/java/org/apache/ozhera/prometheus/agent/entity/ScrapeConfigEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.entity; +package org.apache.ozhera.prometheus.agent.entity; import lombok.Data; import lombok.ToString; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml index 22fdf192d..57c51dd95 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-prometheus-agent - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 ozhera-prometheus-agent-server @@ -121,7 +121,7 @@ 2.7.5 - com.xiaomi.youpin.prometheus.agent.bootstrap.PrometheusAgentBootstrap + org.apache.ozhera.prometheus.agent.bootstrap.PrometheusAgentBootstrap diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/aop/ArgCheck.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/aop/ArgCheck.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/aop/ArgCheck.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/aop/ArgCheck.java index 1bd14b9a3..b023b116a 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/aop/ArgCheck.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/aop/ArgCheck.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.aop; +package org.apache.ozhera.prometheus.agent.aop; import java.lang.annotation.*; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/aop/ArgCheckAspect.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/aop/ArgCheckAspect.java similarity index 91% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/aop/ArgCheckAspect.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/aop/ArgCheckAspect.java index 87af2d63a..b696218a7 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/aop/ArgCheckAspect.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/aop/ArgCheckAspect.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.aop; +package org.apache.ozhera.prometheus.agent.aop; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.param.BaseParam; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.param.BaseParam; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -50,13 +50,13 @@ public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable { RequestMapping reqMapping = method.getAnnotation(RequestMapping.class); Class resultCls = method.getReturnType(); for (Object arg : args) { - if (!(arg instanceof com.xiaomi.youpin.prometheus.agent.param.ArgCheck)) { + if (!(arg instanceof org.apache.ozhera.prometheus.agent.param.ArgCheck)) { continue; } if (arg instanceof BaseParam) { BaseParam baseParam = (BaseParam) arg; log.info("接口{}请求参数{}", method.getName(), arg); - if (!((com.xiaomi.youpin.prometheus.agent.param.ArgCheck) arg).argCheck()) { + if (!((org.apache.ozhera.prometheus.agent.param.ArgCheck) arg).argCheck()) { log.warn("用户请求参数校验失败; arg={}", arg); return getResult(resultCls, ErrorCode.invalidParamError); } diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java index 2f9f8de0d..552fceec9 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/bootstrap/PrometheusAgentBootstrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.bootstrap; +package org.apache.ozhera.prometheus.agent.bootstrap; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/CacheConfiguration.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/CacheConfiguration.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/CacheConfiguration.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/CacheConfiguration.java index a13d30483..3b79a5486 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/CacheConfiguration.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/CacheConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.config; +package org.apache.ozhera.prometheus.agent.config; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/ClientConfiguration.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/ClientConfiguration.java similarity index 76% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/ClientConfiguration.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/ClientConfiguration.java index 5abfde118..1369c9bfc 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/ClientConfiguration.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/ClientConfiguration.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.config; +package org.apache.ozhera.prometheus.agent.config; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.youpin.prometheus.agent.alertManagerClient.AlertManagerAliClient; -import com.xiaomi.youpin.prometheus.agent.alertManagerClient.AlertManagerClient; -import com.xiaomi.youpin.prometheus.agent.alertManagerClient.AlertManagerVMClient; -import com.xiaomi.youpin.prometheus.agent.client.Client; -import com.xiaomi.youpin.prometheus.agent.enums.ClientType; -import com.xiaomi.youpin.prometheus.agent.operators.vm.VMPrometheusOperator; -import com.xiaomi.youpin.prometheus.agent.prometheusClient.PrometheusAliClient; -import com.xiaomi.youpin.prometheus.agent.prometheusClient.PrometheusClient; -import com.xiaomi.youpin.prometheus.agent.operators.ali.AliPrometheusOperator; -import com.xiaomi.youpin.prometheus.agent.operators.BasicOperator; -import com.xiaomi.youpin.prometheus.agent.operators.local.LocalPrometheusOperator; -import com.xiaomi.youpin.prometheus.agent.prometheusClient.PrometheusVMClient; +import org.apache.ozhera.prometheus.agent.alertManagerClient.AlertManagerAliClient; +import org.apache.ozhera.prometheus.agent.alertManagerClient.AlertManagerClient; +import org.apache.ozhera.prometheus.agent.alertManagerClient.AlertManagerVMClient; +import org.apache.ozhera.prometheus.agent.client.Client; +import org.apache.ozhera.prometheus.agent.enums.ClientType; +import org.apache.ozhera.prometheus.agent.operators.vm.VMPrometheusOperator; +import org.apache.ozhera.prometheus.agent.prometheusClient.PrometheusAliClient; +import org.apache.ozhera.prometheus.agent.prometheusClient.PrometheusClient; +import org.apache.ozhera.prometheus.agent.operators.ali.AliPrometheusOperator; +import org.apache.ozhera.prometheus.agent.operators.BasicOperator; +import org.apache.ozhera.prometheus.agent.operators.local.LocalPrometheusOperator; +import org.apache.ozhera.prometheus.agent.prometheusClient.PrometheusVMClient; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DataSourceConfiguration.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/DataSourceConfiguration.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DataSourceConfiguration.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/DataSourceConfiguration.java index be1fcafda..e1cb1f972 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DataSourceConfiguration.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/DataSourceConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.config; +package org.apache.ozhera.prometheus.agent.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.mchange.v2.c3p0.ComboPooledDataSource; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DubboConfiguration.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/DubboConfiguration.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DubboConfiguration.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/DubboConfiguration.java index 6d536cab8..51d94cc16 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/DubboConfiguration.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/DubboConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.config; +package org.apache.ozhera.prometheus.agent.config; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.common.collect.Maps; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/NacosConfiguration.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/NacosConfiguration.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/NacosConfiguration.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/NacosConfiguration.java index ddd135f43..dfd7b7ea9 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/config/NacosConfiguration.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/config/NacosConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.config; +package org.apache.ozhera.prometheus.agent.config; import com.alibaba.nacos.api.annotation.NacosProperties; import com.alibaba.nacos.api.config.annotation.NacosValue; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusAlertController.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusAlertController.java similarity index 91% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusAlertController.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusAlertController.java index e0e5d057a..e996c3776 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusAlertController.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusAlertController.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.controller; +package org.apache.ozhera.prometheus.agent.controller; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.Commons; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.param.alert.RuleAlertParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.RuleAlertService; +import org.apache.ozhera.prometheus.agent.Commons; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.param.alert.RuleAlertParam; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.service.prometheus.RuleAlertService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusController.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusController.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusController.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusController.java index 381cc5cea..de64d309f 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusController.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusController.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.controller; +package org.apache.ozhera.prometheus.agent.controller; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.MioneMachineService; -import com.xiaomi.youpin.prometheus.agent.service.PrometheusIpService; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.MioneMachineService; +import org.apache.ozhera.prometheus.agent.service.PrometheusIpService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusScrapeJobController.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusScrapeJobController.java similarity index 88% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusScrapeJobController.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusScrapeJobController.java index 3355592b3..bce654146 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusScrapeJobController.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusScrapeJobController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.controller; +package org.apache.ozhera.prometheus.agent.controller; -import com.xiaomi.youpin.prometheus.agent.Commons; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.ScrapeJobService; +import org.apache.ozhera.prometheus.agent.Commons; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.service.prometheus.ScrapeJobService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusSilenceController.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusSilenceController.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusSilenceController.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusSilenceController.java index 9761d502b..a49ee4bc5 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusSilenceController.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusSilenceController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.controller; +package org.apache.ozhera.prometheus.agent.controller; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.service.dto.SilenceAlertManagerReqBuilder; -import com.xiaomi.youpin.prometheus.agent.service.dto.dingding.SilenceCallBack; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.RuleSilenceService; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.service.dto.SilenceAlertManagerReqBuilder; +import org.apache.ozhera.prometheus.agent.service.dto.dingding.SilenceCallBack; +import org.apache.ozhera.prometheus.agent.service.prometheus.RuleSilenceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusVMController.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusVMController.java similarity index 91% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusVMController.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusVMController.java index f749f8851..32ea4bb15 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/com/xiaomi/youpin/prometheus/agent/controller/PrometheusVMController.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/main/java/org/apache/ozhera/prometheus/agent/controller/PrometheusVMController.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.controller; +package org.apache.ozhera.prometheus.agent.controller; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.PrometheusVmService; -import com.xiaomi.youpin.prometheus.agent.util.FileUtil; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.PrometheusVmService; +import org.apache.ozhera.prometheus.agent.util.FileUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/AliPrometheusTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/AliPrometheusTest.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/AliPrometheusTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/AliPrometheusTest.java index d918876f0..d6f706784 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/AliPrometheusTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/AliPrometheusTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; import lombok.extern.slf4j.Slf4j; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/MailTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/MailTest.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/MailTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/MailTest.java index a064ae9f0..755e07db1 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/MailTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/MailTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; import com.google.gson.Gson; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/RuleSilenceTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/RuleSilenceTest.java similarity index 97% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/RuleSilenceTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/RuleSilenceTest.java index f59e05864..e1200607d 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/RuleSilenceTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/RuleSilenceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/feishuTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/feishuTest.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/feishuTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/feishuTest.java index a03a1e893..036c0a52e 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/com/xiaomi/youpin/prometheus/agent/test/feishuTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/src/test/java/org/apache/ozhera/prometheus/agent/test/feishuTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; import com.google.gson.Gson; /** diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml index fca44f16f..e5496dbf0 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + org.apache.ozhera ozhera-prometheus-agent - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/domain/Ips.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/domain/Ips.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/domain/Ips.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/domain/Ips.java index e950404a8..fc62ee9db 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/domain/Ips.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/domain/Ips.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.domain; +package org.apache.ozhera.prometheus.agent.domain; import java.util.List; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/DingDingService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/DingDingService.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/DingDingService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/DingDingService.java index 6f5b452e5..43a6acc5f 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/DingDingService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/DingDingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service; +package org.apache.ozhera.prometheus.agent.service; /** * @author zhangxiaowei6 diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/FeishuService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/FeishuService.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/FeishuService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/FeishuService.java index 9886e7d4a..56e6b9623 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/FeishuService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/FeishuService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service; +package org.apache.ozhera.prometheus.agent.service; public interface FeishuService { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/InitService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/InitService.java similarity index 92% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/InitService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/InitService.java index 8164770d9..a478d5353 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/InitService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/InitService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service; +package org.apache.ozhera.prometheus.agent.service; public interface InitService { diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/MioneMachineService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/MioneMachineService.java similarity index 68% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/MioneMachineService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/MioneMachineService.java index d4ca493ea..bd3b05f41 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/MioneMachineService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/MioneMachineService.java @@ -13,13 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service; +package org.apache.ozhera.prometheus.agent.service; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.api.MioneMachineServiceExtension; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import org.apache.ozhera.prometheus.agent.domain.Ips; import java.util.List; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/PrometheusIpService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/PrometheusIpService.java similarity index 89% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/PrometheusIpService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/PrometheusIpService.java index 385b0bb7f..557965d8d 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/PrometheusIpService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/PrometheusIpService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service; +package org.apache.ozhera.prometheus.agent.service; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.domain.Ips; import java.util.List; import java.util.Set; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/PrometheusVmService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/PrometheusVmService.java similarity index 88% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/PrometheusVmService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/PrometheusVmService.java index 8beb07040..b73f7521e 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/PrometheusVmService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/PrometheusVmService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service; +package org.apache.ozhera.prometheus.agent.service; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.domain.Ips; import java.util.List; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/BaseAlertContact.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/BaseAlertContact.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/BaseAlertContact.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/BaseAlertContact.java index 2d5a221a8..83e7e88bc 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/BaseAlertContact.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/BaseAlertContact.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.alarmContact; +package org.apache.ozhera.prometheus.agent.service.alarmContact; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.AlertManagerFireResult; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.Alerts; -import com.xiaomi.youpin.prometheus.agent.util.DateUtil; +import org.apache.ozhera.prometheus.agent.result.alertManager.AlertManagerFireResult; +import org.apache.ozhera.prometheus.agent.result.alertManager.Alerts; +import org.apache.ozhera.prometheus.agent.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/DingAlertContact.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/DingAlertContact.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/DingAlertContact.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/DingAlertContact.java index 1781aab57..2a319bd0b 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/DingAlertContact.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/DingAlertContact.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.alarmContact; +package org.apache.ozhera.prometheus.agent.service.alarmContact; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.Impl.RuleAlertDao; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.AlertManagerFireResult; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.Labels; -import com.xiaomi.youpin.prometheus.agent.service.DingDingService; -import com.xiaomi.youpin.prometheus.agent.util.DateUtil; -import com.xiaomi.youpin.prometheus.agent.util.FreeMarkerUtil; +import org.apache.ozhera.prometheus.agent.Impl.RuleAlertDao; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.result.alertManager.AlertManagerFireResult; +import org.apache.ozhera.prometheus.agent.result.alertManager.Labels; +import org.apache.ozhera.prometheus.agent.service.DingDingService; +import org.apache.ozhera.prometheus.agent.util.DateUtil; +import org.apache.ozhera.prometheus.agent.util.FreeMarkerUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/FeishuAlertContact.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/FeishuAlertContact.java similarity index 89% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/FeishuAlertContact.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/FeishuAlertContact.java index 3db79268f..f08ac8913 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/FeishuAlertContact.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/FeishuAlertContact.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.alarmContact; +package org.apache.ozhera.prometheus.agent.service.alarmContact; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.youpin.prometheus.agent.Impl.RuleAlertDao; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.AlertManagerFireResult; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.Alerts; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.CommonLabels; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.GroupLabels; -import com.xiaomi.youpin.prometheus.agent.service.FeishuService; -import com.xiaomi.youpin.prometheus.agent.util.FreeMarkerUtil; +import org.apache.ozhera.prometheus.agent.Impl.RuleAlertDao; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.result.alertManager.AlertManagerFireResult; +import org.apache.ozhera.prometheus.agent.result.alertManager.Alerts; +import org.apache.ozhera.prometheus.agent.result.alertManager.CommonLabels; +import org.apache.ozhera.prometheus.agent.result.alertManager.GroupLabels; +import org.apache.ozhera.prometheus.agent.service.FeishuService; +import org.apache.ozhera.prometheus.agent.util.FreeMarkerUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/MailAlertContact.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/MailAlertContact.java similarity index 89% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/MailAlertContact.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/MailAlertContact.java index a41fdfe1d..c18107134 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/alarmContact/MailAlertContact.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/alarmContact/MailAlertContact.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.alarmContact; +package org.apache.ozhera.prometheus.agent.service.alarmContact; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.youpin.prometheus.agent.Impl.RuleAlertDao; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.AlertManagerFireResult; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.Alerts; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.CommonLabels; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.GroupLabels; -import com.xiaomi.youpin.prometheus.agent.util.FreeMarkerUtil; -import com.xiaomi.youpin.prometheus.agent.util.MailUtil; +import org.apache.ozhera.prometheus.agent.Impl.RuleAlertDao; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.result.alertManager.AlertManagerFireResult; +import org.apache.ozhera.prometheus.agent.result.alertManager.Alerts; +import org.apache.ozhera.prometheus.agent.result.alertManager.CommonLabels; +import org.apache.ozhera.prometheus.agent.result.alertManager.GroupLabels; +import org.apache.ozhera.prometheus.agent.util.FreeMarkerUtil; +import org.apache.ozhera.prometheus.agent.util.MailUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/MioneMachineServiceExtension.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/MioneMachineServiceExtension.java similarity index 87% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/MioneMachineServiceExtension.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/MioneMachineServiceExtension.java index c20e938a7..41b7e76cf 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/MioneMachineServiceExtension.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/MioneMachineServiceExtension.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.api; +package org.apache.ozhera.prometheus.agent.service.api; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.domain.Ips; import java.util.List; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/PrometheusIpServiceExtension.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/PrometheusIpServiceExtension.java similarity index 89% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/PrometheusIpServiceExtension.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/PrometheusIpServiceExtension.java index 22d9a7608..4559373b7 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/PrometheusIpServiceExtension.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/PrometheusIpServiceExtension.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.api; +package org.apache.ozhera.prometheus.agent.service.api; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.domain.Ips; import java.util.List; import java.util.Set; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java similarity index 86% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java index 3b8527e71..671be1fc3 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/impl/MioneMachineServiceExtensionImpl.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.api.impl; +package org.apache.ozhera.prometheus.agent.service.api.impl; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.api.MioneMachineServiceExtension; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.api.MioneMachineServiceExtension; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java index 4c5792502..75dfaf937 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/api/impl/PrometheusIpServiceExtensionImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.api.impl; +package org.apache.ozhera.prometheus.agent.service.api.impl; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.alibaba.nacos.api.exception.NacosException; @@ -23,8 +23,8 @@ import com.google.common.base.Stopwatch; import com.google.gson.Gson; import com.xiaomi.data.push.nacos.NacosNaming; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.api.PrometheusIpServiceExtension; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.api.PrometheusIpServiceExtension; import io.fabric8.kubernetes.api.model.Node; import io.fabric8.kubernetes.api.model.NodeAddress; import io.fabric8.kubernetes.api.model.NodeList; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java similarity index 95% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java index b0254a91c..2c7384322 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/SilenceAlertManagerReqBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.dto; +package org.apache.ozhera.prometheus.agent.service.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/dingding/SilenceCallBack.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/dingding/SilenceCallBack.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/dingding/SilenceCallBack.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/dingding/SilenceCallBack.java index 4df16012b..24f6ed276 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/dingding/SilenceCallBack.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/dingding/SilenceCallBack.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.dto.dingding; +package org.apache.ozhera.prometheus.agent.service.dto.dingding; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java index 5bd2e2cdd..38ac804d2 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/dto/heraApp/GetAllPodIpRes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.dto.heraApp; +package org.apache.ozhera.prometheus.agent.service.dto.heraApp; import lombok.Data; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/DingDingServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/DingDingServiceImpl.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/DingDingServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/DingDingServiceImpl.java index 0eba8636c..78e093502 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/DingDingServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/DingDingServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.aliyun.dingtalkcard_1_0.models.RegisterCallbackResponse; @@ -29,7 +29,7 @@ import com.aliyun.teaopenapi.models.Config; import com.aliyun.teautil.models.RuntimeOptions; import com.google.common.cache.Cache; -import com.xiaomi.youpin.prometheus.agent.service.DingDingService; +import org.apache.ozhera.prometheus.agent.service.DingDingService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/FeishuServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/FeishuServiceImpl.java similarity index 96% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/FeishuServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/FeishuServiceImpl.java index a99c0f330..ee996f25b 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/FeishuServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/FeishuServiceImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; import com.xiaomi.youpin.feishu.FeiShu; -import com.xiaomi.youpin.prometheus.agent.service.FeishuService; +import org.apache.ozhera.prometheus.agent.service.FeishuService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/InitServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/InitServiceImpl.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/InitServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/InitServiceImpl.java index a7d50708b..fe2509313 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/InitServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/InitServiceImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; import com.xiaomi.data.push.nacos.NacosNaming; -import com.xiaomi.youpin.prometheus.agent.service.InitService; +import org.apache.ozhera.prometheus.agent.service.InitService; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.NetUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/MioneMachineServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/MioneMachineServiceImpl.java similarity index 82% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/MioneMachineServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/MioneMachineServiceImpl.java index 6ef1d68ed..e4d4f26cb 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/MioneMachineServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/MioneMachineServiceImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.MioneMachineService; -import com.xiaomi.youpin.prometheus.agent.service.api.MioneMachineServiceExtension; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.MioneMachineService; +import org.apache.ozhera.prometheus.agent.service.api.MioneMachineServiceExtension; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java similarity index 87% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java index 5af37d327..c33fcd8db 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusAlertServiceImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; -import com.xiaomi.youpin.prometheus.agent.Commons; -import com.xiaomi.youpin.prometheus.agent.api.service.PrometheusAlertService; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.param.alert.RuleAlertParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.RuleAlertService; +import org.apache.ozhera.prometheus.agent.Commons; +import org.apache.ozhera.prometheus.agent.api.service.PrometheusAlertService; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.param.alert.RuleAlertParam; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.service.prometheus.RuleAlertService; import org.apache.commons.lang3.StringUtils; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java similarity index 80% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java index 1cb42deab..4eb01dc0f 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusDubboServiceImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; -import com.xiaomi.youpin.prometheus.agent.api.bo.PrometheusReq; -import com.xiaomi.youpin.prometheus.agent.api.bo.Result; -import com.xiaomi.youpin.prometheus.agent.api.service.PrometheusDubboService; -import com.xiaomi.youpin.prometheus.agent.service.PrometheusIpService; +import org.apache.ozhera.prometheus.agent.api.bo.PrometheusReq; +import org.apache.ozhera.prometheus.agent.api.bo.Result; +import org.apache.ozhera.prometheus.agent.api.service.PrometheusDubboService; +import org.apache.ozhera.prometheus.agent.service.PrometheusIpService; import org.apache.dubbo.config.annotation.Service; import javax.annotation.Resource; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusIpServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusIpServiceImpl.java similarity index 91% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusIpServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusIpServiceImpl.java index 2b981e74f..48508bf6b 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusIpServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusIpServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; import com.xiaomi.data.push.client.HttpClientV2; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.PrometheusIpService; -import com.xiaomi.youpin.prometheus.agent.service.api.PrometheusIpServiceExtension; -import com.xiaomi.youpin.prometheus.agent.service.dto.heraApp.GetAllPodIpRes; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.PrometheusIpService; +import org.apache.ozhera.prometheus.agent.service.api.PrometheusIpServiceExtension; +import org.apache.ozhera.prometheus.agent.service.dto.heraApp.GetAllPodIpRes; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java similarity index 84% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java index 7e251d341..e601c1899 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusScrapeJobImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; -import com.xiaomi.youpin.prometheus.agent.Commons; -import com.xiaomi.youpin.prometheus.agent.api.service.PrometheusScrapeJobService; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.service.prometheus.ScrapeJobService; +import org.apache.ozhera.prometheus.agent.Commons; +import org.apache.ozhera.prometheus.agent.api.service.PrometheusScrapeJobService; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.service.prometheus.ScrapeJobService; import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.factory.annotation.Autowired; @Service(timeout = 5000, group = "${dubbo.group}") diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusVmServiceImpl.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusVmServiceImpl.java similarity index 94% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusVmServiceImpl.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusVmServiceImpl.java index c50d1e646..89d8bf3c6 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/impl/PrometheusVmServiceImpl.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/impl/PrometheusVmServiceImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.impl; +package org.apache.ozhera.prometheus.agent.service.impl; import com.alibaba.nacos.api.config.annotation.NacosValue; -import com.xiaomi.youpin.prometheus.agent.domain.Ips; -import com.xiaomi.youpin.prometheus.agent.service.PrometheusVmService; +import org.apache.ozhera.prometheus.agent.domain.Ips; +import org.apache.ozhera.prometheus.agent.service.PrometheusVmService; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/RuleAlertService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/RuleAlertService.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/RuleAlertService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/RuleAlertService.java index 55babd4ba..183cfd159 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/RuleAlertService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/RuleAlertService.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.prometheus; +package org.apache.ozhera.prometheus.agent.service.prometheus; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; import com.google.gson.JsonObject; -import com.xiaomi.youpin.prometheus.agent.Commons; -import com.xiaomi.youpin.prometheus.agent.Impl.RuleAlertDao; -import com.xiaomi.youpin.prometheus.agent.entity.RuleAlertEntity; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.enums.RuleAlertStatusEnum; -import com.xiaomi.youpin.prometheus.agent.param.alert.RuleAlertParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.AlertManagerFireResult; -import com.xiaomi.youpin.prometheus.agent.service.alarmContact.DingAlertContact; -import com.xiaomi.youpin.prometheus.agent.service.alarmContact.FeishuAlertContact; -import com.xiaomi.youpin.prometheus.agent.service.alarmContact.MailAlertContact; -import com.xiaomi.youpin.prometheus.agent.vo.PageDataVo; +import org.apache.ozhera.prometheus.agent.Commons; +import org.apache.ozhera.prometheus.agent.Impl.RuleAlertDao; +import org.apache.ozhera.prometheus.agent.entity.RuleAlertEntity; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.enums.RuleAlertStatusEnum; +import org.apache.ozhera.prometheus.agent.param.alert.RuleAlertParam; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.result.alertManager.AlertManagerFireResult; +import org.apache.ozhera.prometheus.agent.service.alarmContact.DingAlertContact; +import org.apache.ozhera.prometheus.agent.service.alarmContact.FeishuAlertContact; +import org.apache.ozhera.prometheus.agent.service.alarmContact.MailAlertContact; +import org.apache.ozhera.prometheus.agent.vo.PageDataVo; import lombok.extern.slf4j.Slf4j; import org.nutz.lang.Strings; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/RuleSilenceService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/RuleSilenceService.java similarity index 88% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/RuleSilenceService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/RuleSilenceService.java index cb6ac7878..541fa4015 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/RuleSilenceService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/RuleSilenceService.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.prometheus; +package org.apache.ozhera.prometheus.agent.service.prometheus; import com.alibaba.nacos.api.config.annotation.NacosValue; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.Impl.RuleAlertDao; -import com.xiaomi.youpin.prometheus.agent.Impl.SilenceDao; -import com.xiaomi.youpin.prometheus.agent.entity.RuleSilenceEntity; -import com.xiaomi.youpin.prometheus.agent.enums.ErrorCode; -import com.xiaomi.youpin.prometheus.agent.enums.RuleSilenceStatusEnum; -import com.xiaomi.youpin.prometheus.agent.param.alert.AMSilence; -import com.xiaomi.youpin.prometheus.agent.param.alert.AMSilenceResponse; -import com.xiaomi.youpin.prometheus.agent.param.alert.Matcher; -import com.xiaomi.youpin.prometheus.agent.param.alert.RuleSilenceParam; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.service.alarmContact.DingAlertContact; -import com.xiaomi.youpin.prometheus.agent.service.dto.SilenceAlertManagerReqBuilder; -import com.xiaomi.youpin.prometheus.agent.util.DateUtil; -import com.xiaomi.youpin.prometheus.agent.util.Http; +import org.apache.ozhera.prometheus.agent.Impl.RuleAlertDao; +import org.apache.ozhera.prometheus.agent.Impl.SilenceDao; +import org.apache.ozhera.prometheus.agent.entity.RuleSilenceEntity; +import org.apache.ozhera.prometheus.agent.enums.ErrorCode; +import org.apache.ozhera.prometheus.agent.enums.RuleSilenceStatusEnum; +import org.apache.ozhera.prometheus.agent.param.alert.AMSilence; +import org.apache.ozhera.prometheus.agent.param.alert.AMSilenceResponse; +import org.apache.ozhera.prometheus.agent.param.alert.Matcher; +import org.apache.ozhera.prometheus.agent.param.alert.RuleSilenceParam; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.service.alarmContact.DingAlertContact; +import org.apache.ozhera.prometheus.agent.service.dto.SilenceAlertManagerReqBuilder; +import org.apache.ozhera.prometheus.agent.util.DateUtil; +import org.apache.ozhera.prometheus.agent.util.Http; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,7 +40,7 @@ import java.util.Date; import java.util.List; -import static com.xiaomi.youpin.prometheus.agent.Commons.HTTP_POST; +import static org.apache.ozhera.prometheus.agent.Commons.HTTP_POST; @Slf4j @Service diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/ScrapeJobService.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/ScrapeJobService.java similarity index 93% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/ScrapeJobService.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/ScrapeJobService.java index 1ca5b3c79..7413aa640 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/com/xiaomi/youpin/prometheus/agent/service/prometheus/ScrapeJobService.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/main/java/org/apache/ozhera/prometheus/agent/service/prometheus/ScrapeJobService.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.service.prometheus; +package org.apache.ozhera.prometheus.agent.service.prometheus; import com.google.gson.Gson; -import com.xiaomi.youpin.prometheus.agent.Impl.ScrapeConfigDao; -import com.xiaomi.youpin.prometheus.agent.enums.ScrapeJobStatusEnum; -import com.xiaomi.youpin.prometheus.agent.param.prometheus.Scrape_configs; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; -import com.xiaomi.youpin.prometheus.agent.result.Result; -import com.xiaomi.youpin.prometheus.agent.entity.ScrapeConfigEntity; -import com.xiaomi.youpin.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; -import com.xiaomi.youpin.prometheus.agent.vo.PageDataVo; +import org.apache.ozhera.prometheus.agent.Impl.ScrapeConfigDao; +import org.apache.ozhera.prometheus.agent.enums.ScrapeJobStatusEnum; +import org.apache.ozhera.prometheus.agent.param.prometheus.Scrape_configs; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigDetail; +import org.apache.ozhera.prometheus.agent.result.Result; +import org.apache.ozhera.prometheus.agent.entity.ScrapeConfigEntity; +import org.apache.ozhera.prometheus.agent.param.scrapeConfig.ScrapeConfigParam; +import org.apache.ozhera.prometheus.agent.vo.PageDataVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/com/xiaomi/youpin/prometheus/agent/test/DingDingTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/org/apache/ozhera/prometheus/agent/test/DingDingTest.java similarity index 99% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/com/xiaomi/youpin/prometheus/agent/test/DingDingTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/org/apache/ozhera/prometheus/agent/test/DingDingTest.java index 0c41e63d9..c59e85515 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/com/xiaomi/youpin/prometheus/agent/test/DingDingTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/org/apache/ozhera/prometheus/agent/test/DingDingTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/com/xiaomi/youpin/prometheus/agent/test/feishuCartTest.java b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/org/apache/ozhera/prometheus/agent/test/feishuCartTest.java similarity index 98% rename from ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/com/xiaomi/youpin/prometheus/agent/test/feishuCartTest.java rename to ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/org/apache/ozhera/prometheus/agent/test/feishuCartTest.java index 1380276df..631083613 100644 --- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/com/xiaomi/youpin/prometheus/agent/test/feishuCartTest.java +++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/src/test/java/org/apache/ozhera/prometheus/agent/test/feishuCartTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.xiaomi.youpin.prometheus.agent.test; +package org.apache.ozhera.prometheus.agent.test; import com.google.gson.Gson; import com.xiaomi.youpin.feishu.FeiShu; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.AlertManagerFireResult; -import com.xiaomi.youpin.prometheus.agent.result.alertManager.Alerts; -import com.xiaomi.youpin.prometheus.agent.util.FreeMarkerUtil; +import org.apache.ozhera.prometheus.agent.result.alertManager.AlertManagerFireResult; +import org.apache.ozhera.prometheus.agent.result.alertManager.Alerts; +import org.apache.ozhera.prometheus.agent.util.FreeMarkerUtil; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/ozhera-prometheus-agent/pom.xml b/ozhera-prometheus-agent/pom.xml index a65215993..ed9b73ff0 100644 --- a/ozhera-prometheus-agent/pom.xml +++ b/ozhera-prometheus-agent/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 ozhera-prometheus-agent - 1.0.0-jdk21 + 2.0.0-SNAPSHOT pom