This is an automated email from the ASF dual-hosted git repository.
dingtao pushed a change to branch business-metrics
in repository https://gitbox.apache.org/repos/asf/ozhera.git
from b7b2bd35 feat: add the function of ai log analysis (#593)
add 4bddd0a7 feat: add agent config and function (#584)
add a08b4860 feat: add new message type and optimize prompt logic (#584)
(#585)
add 5f31d053 feat: add trace analysis service (#590)
add 6e45d594 Merge branch 'master' into intelligence-front-end
add 127622e3 feat: merge Intelligence front end branch to master (#594)
add 01212237 feat: add trace downgrade strategy switch (#592) (#595)
new 9f3d2d46 fix: add SNAPSHOT repository
add 2f2ce9ff fix: clear author info (#596)
new 715c40f6 Merge branch 'apache:master' into master
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../app/api/message/HeraAppInfoModifyMessage.java | 3 +-
.../ozhera/app/api/message/HeraAppModifyType.java | 3 +-
.../app/api/model/HeraAppBaseInfoParticipant.java | 3 +-
.../ozhera/app/api/model/HeraAppBaseQuery.java | 3 +-
.../ozhera/app/api/model/HeraAppEnvData.java | 1 -
.../apache/ozhera/app/api/model/HeraAppMqInfo.java | 1 -
.../ozhera/app/api/model/HeraAppRoleModel.java | 3 +-
.../apache/ozhera/app/api/model/HeraSimpleEnv.java | 1 -
.../project/group/HeraProjectGroupAppRequest.java | 3 +-
.../project/group/HeraProjectGroupDataRequest.java | 3 +-
.../model/project/group/HeraProjectGroupModel.java | 3 +-
.../project/group/HeraProjectGroupUserModel.java | 3 +-
.../model/project/group/ProjectGroupTreeNode.java | 3 +-
.../ozhera/app/api/response/AppBaseInfo.java | 1 -
.../ozhera/app/api/response/PairResponse.java | 1 -
.../app/api/service/HeraAppEnvOutwardService.java | 1 -
.../ozhera/app/api/service/HeraAppService.java | 1 -
.../app/api/service/HeraAuthorizationApi.java | 3 +-
.../api/service/HeraProjectGroupServiceApi.java | 3 +-
.../org/apache/ozhera/app/common/Constant.java | 1 -
.../java/org/apache/ozhera/app/common/Result.java | 1 -
.../org/apache/ozhera/app/enums/AppTypeEnum.java | 1 -
.../org/apache/ozhera/app/enums/BizCodeEnum.java | 1 -
.../org/apache/ozhera/app/enums/CommonError.java | 1 -
.../org/apache/ozhera/app/enums/OperateEnum.java | 1 -
.../java/org/apache/ozhera/app/enums/PlatForm.java | 1 -
.../apache/ozhera/app/enums/PlatFormTypeEnum.java | 1 -
.../apache/ozhera/app/enums/ProjectTypeEnum.java | 1 -
.../org/apache/ozhera/app/enums/StatusEnum.java | 1 -
.../apache/ozhera/app/exception/AppException.java | 1 -
.../org/apache/ozhera/app/model/BaseCommon.java | 1 -
.../apache/ozhera/app/model/vo/HeraAppEnvVo.java | 1 -
.../ozhera/app/model/vo/HeraAppOperateVo.java | 1 -
.../apache/ozhera/app/model/vo/HeraEnvIpVo.java | 1 -
.../apache/ozhera/app/model/vo/TpcLabelRes.java | 1 -
.../org/apache/ozhera/app/model/vo/TpcPageRes.java | 1 -
.../java/org/apache/ozhera/app/valid/AddGroup.java | 1 -
.../org/apache/ozhera/app/valid/UpdateGroup.java | 1 -
.../java/org/apache/ozhera/app/AppBootstrap.java | 1 -
.../ozhera/app/aop/OperateAppBaseInfoAspect.java | 1 -
.../org/apache/ozhera/app/config/BeanConfig.java | 1 -
.../apache/ozhera/app/config/DataSourceConfig.java | 1 -
.../ozhera/app/config/DubboConfiguration.java | 1 -
.../apache/ozhera/app/config/RocketMqConfig.java | 1 -
.../ozhera/app/controller/AppController.java | 1 -
.../app/controller/HeraAppEnvController.java | 1 -
.../ozhera/app/controller/TestController.java | 1 -
.../exception/AppExceptionControllerAdvice.java | 1 -
.../org/apache/ozhera/app/job/HeraAppEnvIpJob.java | 1 -
.../ozhera/app/response/AppResponseAdvice.java | 1 -
.../org/apache/ozhera/app/test/AppBaseTest.java | 3 +-
.../ozhera/app/test/EnvIpFetchServiceTest.java | 1 -
.../ozhera/app/test/HeraAppEnvControllerTest.java | 1 -
.../app/test/HeraAppEnvOutwardServiceTest.java | 1 -
.../ozhera/app/test/HeraProjectGroupTest.java | 3 +-
.../org/apache/ozhera/app/test/RocketMqTest.java | 1 -
.../apache/ozhera/app/test/SpringBootFeatTest.java | 1 -
.../java/org/apache/ozhera/app/test/UserBean.java | 1 -
.../ozhera/app/auth/AuthorizationService.java | 3 +-
.../ozhera/app/config/NacosConfiguration.java | 1 -
.../app/dao/mapper/HeraAppBaseInfoMapper.java | 1 -
.../ozhera/app/dao/mapper/HeraAppEnvMapper.java | 1 -
.../app/dao/mapper/HeraAppExcessInfoMapper.java | 1 -
.../apache/ozhera/app/model/HeraAppBaseInfo.java | 1 -
.../org/apache/ozhera/app/model/HeraAppEnv.java | 1 -
.../apache/ozhera/app/model/HeraAppExcessInfo.java | 1 -
.../apache/ozhera/app/model/HeraMetaDataPort.java | 1 -
.../ozhera/app/service/HeraAppEnvService.java | 1 -
.../ozhera/app/service/HeraAppRoleService.java | 3 +-
.../ozhera/app/service/env/DefaultEnvIpFetch.java | 1 -
.../app/service/env/DefaultHttpEnvIpFetch.java | 1 -
.../app/service/env/DefaultNacosEnvIpFetch.java | 1 -
.../apache/ozhera/app/service/env/EnvIpFetch.java | 1 -
.../service/extension/AppTypeServiceExtension.java | 1 -
.../impl/DefaultAppTypeServiceExtension.java | 1 -
.../app/service/impl/AuthorizationServiceImpl.java | 3 +-
.../app/service/impl/HeraAppBaseInfoService.java | 3 +-
.../service/impl/HeraAppEnvOutwardServiceImpl.java | 1 -
.../app/service/impl/HeraAppEnvServiceImpl.java | 1 -
.../app/service/impl/HeraAppServiceImpl.java | 1 -
.../service/impl/HeraProjectGroupServiceImpl.java | 3 +-
.../app/service/mq/RocketMqHeraAppConsumer.java | 3 +-
.../app/service/mq/RocketMqHeraAppProducer.java | 3 +-
.../app/service/mq/model/HeraAppMessage.java | 3 +-
.../project/group/HeraProjectGroupService.java | 3 +-
.../service/project/group/TreeQueryBuilder.java | 3 +-
.../ozhera/app/util/AppTypeTransferUtil.java | 1 -
.../client/bootstrap/HeraDemoClientBootstrap.java | 3 -
.../client/config/PrometheusConfiguration.java | 1 -
ozhera-intelligence/README.md | 29 +-
ozhera-intelligence/README_cn.md | 15 +-
.../rootanalysis/HeraRootCaseAnalyseRes.java | 4 -
.../domain/rootanalysis/LogPromptResult.java | 6 +
.../domain/rootanalysis/MetricsPromptResult.java | 4 +
.../domain/rootanalysis/TracePromptResult.java | 13 +
.../domain/rootanalysis/TraceQueryParam.java | 2 +-
.../domain/rootanalysis/constant/Prompts.java | 175 ++++++++++++
.../rootanalysis/constant}/RootAnalysisConst.java | 2 +-
.../src/main/resources/application.properties | 5 +-
.../resources/config/opensource-outer.properties | 4 +-
.../ozhera-intelligence-service/pom.xml | 7 +
.../intelligence/agents/config/AgentConfig.java | 66 +++++
.../agents/function/TraceAnalysisFunction.java | 97 +++++++
.../ozhera/intelligence/service/LogService.java | 4 -
.../intelligence/service/MetricsService.java | 4 -
.../ozhera/intelligence/service/PromptService.java | 160 +++++++++--
.../intelligence/service/TraceAnalysisService.java | 261 ++++++++++++++++++
.../ozhera/intelligence/service/TraceService.java | 24 +-
.../ozhera/intelligence/util/HttpClient.java | 4 -
.../intelligence/service/PromptServiceTest.java | 295 +++++++++++++++++++++
ozhera-intelligence/pom.xml | 15 ++
.../ozhera/log/agent/channel/ChannelEngine.java | 1 -
.../ozhera/log/agent/extension/KafkaExporter.java | 29 +-
.../ozhera/log/agent/extension/KafkaService.java | 32 ++-
.../ozhera/log/agent/extension/RmqExporter.java | 7 +-
.../log/agent/extension/RocketMQService.java | 1 -
.../log/agent/extension/TopAppPartitioner.java | 56 ++++
.../extension/nacos/AppPartitionConfigService.java | 168 ++++++++++++
.../agent/extension/nacos/NacosConfigUtil.java} | 26 +-
.../log/agent/factory/OutPutServiceFactory.java | 1 -
.../OuterChannelDefineLocatorExtensionImpl.java | 1 -
.../log-agent/src/main/resources/config.properties | 4 +-
.../ozhera/monitor/pojo/BasicUrlTypePOJO.java | 1 -
.../ozhera/monitor/pojo/MetricLabelKindPOJO.java | 1 -
.../ozhera/monitor/pojo/ReqSlowMetricsPOJO.java | 1 -
.../alertmanager/impl/AlarmExprServiceOuter.java | 24 ++
.../service/api/MetricsLabelKindService.java | 1 -
.../api/impl/AlarmPresetMetricsServiceImpl.java | 1 -
.../api/impl/AppAlarmServiceExtensionImpl.java | 1 -
.../AppGrafanaMappingServiceExtensionImpl.java | 1 -
.../api/impl/ComputeTimerServiceExtensionImpl.java | 1 -
.../monitor/service/api/impl/IAMServiceImpl.java | 1 -
.../api/impl/MetricsLabelKindServiceImpl.java | 1 -
.../api/impl/ReqErrorMetricsServiceImpl.java | 1 -
.../api/impl/ReqSlowMetricsServiceImpl.java | 1 -
.../monitor/service/api/impl/TeslaServiceImpl.java | 1 -
.../monitor/service/es/EsExtensionServiceImpl.java | 1 -
.../service/helper/AlertHelperExtensionImpl.java | 1 -
.../prometheus/AlarmServiceExtensionImpl.java | 1 -
.../ozhera/operator/common/ESIndexConst.java | 1 -
.../apache/ozhera/operator/common/FileUtils.java | 1 -
.../apache/ozhera/operator/common/HoConstant.java | 1 -
.../ozhera/operator/common/ResourceTypeEnum.java | 1 -
.../org/apache/ozhera/operator/HeraBootstrap.java | 1 -
.../controller/OzHeraOperatorController.java | 1 -
..._intelligence_config_#_DEFAULT_GROUP.properties | 2 +
.../hera_trace_config_#_DEFAULT_GROUP.properties | 5 +-
...imonitor_open_config_#_DEFAULT_GROUP.properties | 3 +
.../apache/ozhera/operator/test/SidecarTest.java | 1 -
.../ozhera/operator/bo/HeraBootstrapList.java | 3 -
.../apache/ozhera/operator/bo/HeraObjectMeta.java | 1 -
.../apache/ozhera/operator/bo/HeraResource.java | 1 -
.../org/apache/ozhera/operator/bo/HeraSpec.java | 3 -
.../org/apache/ozhera/operator/bo/HeraStatus.java | 3 -
.../org/apache/ozhera/operator/bo/PropConf.java | 1 -
.../operator/bo/dashboard/GrafanaApiKeyReq.java | 1 -
.../operator/bo/dashboard/GrafanaApiKeyRes.java | 1 -
.../apache/ozhera/operator/common/K8sUtilBean.java | 1 -
.../apache/ozhera/operator/dto/DashboardDTO.java | 1 -
.../apache/ozhera/operator/dto/DeployStateDTO.java | 1 -
.../ozhera/operator/dto/HeraOperatorDefineDTO.java | 1 -
.../ozhera/operator/dto/OperatorStateDTO.java | 1 -
.../apache/ozhera/operator/dto/PodStateDTO.java | 1 -
.../ozhera/operator/dto/ServiceCheckResource.java | 1 -
.../operator/handler/HeraResourceEventHandler.java | 8 +-
.../apache/ozhera/operator/service/ESService.java | 1 -
.../operator/service/HeraBootstrapInitService.java | 1 -
.../apache/ozhera/operator/service/IResource.java | 1 -
.../ozhera/operator/service/NacosService.java | 1 -
.../ozhera/operator/service/RocketMQService.java | 1 -
.../ozhera/operator/test/PlaceholderTest.java | 1 -
.../agent/bootstrap/PrometheusAgentBootstrap.java | 3 -
.../java/org/apache/ozhera/webhook/Bootstrap.java | 3 -
.../webhook/controller/HeraWebhookController.java | 4 -
.../apache/ozhera/webhook/domain/JsonPatch.java | 1 -
.../ozhera/webhook/service/HeraWebhookService.java | 2 -
.../service/impl/HeraWebhookServiceImpl.java | 1 -
pom.xml | 7 +
.../client/binder/ClassLoaderMetricsReduced.java | 1 -
.../all/client/binder/JvmGcMetricsReduced.java | 1 -
.../all/client/binder/JvmMemoryMetricsReduced.java | 1 -
.../all/client/binder/JvmThreadMetricsReduced.java | 1 -
.../prometheus/starter/all/domain/Const.java | 1 -
.../starter/all/factory/ServiceFactory.java | 2 -
.../all/service/MilinePrometheusService.java | 1 -
.../trace/etl/api/service/TraceManagerService.java | 1 -
.../trace/etl/api/service/TraceQueryService.java | 4 -
.../apache/ozhera/trace/etl/common/HashUtil.java | 1 -
.../ozhera/trace/etl/common/TimeConverter.java | 1 -
.../ozhera/trace/etl/domain/DriverDomain.java | 1 -
.../ozhera/trace/etl/domain/HeraTraceConfigVo.java | 1 -
.../trace/etl/domain/JaegerTracerDomain.java | 1 -
.../trace/etl/domain/MetricsParseResult.java | 53 +---
.../ozhera/trace/etl/domain/NginxJaegerDomain.java | 3 +-
.../apache/ozhera/trace/etl/domain/PagerVo.java | 1 -
.../trace/etl/domain/metadata/HeraMetaData.java | 3 -
.../etl/domain/metadata/HeraMetaDataMessage.java | 3 -
.../etl/domain/metadata/HeraMetaDataModel.java | 3 -
.../etl/domain/metadata/HeraMetaDataPort.java | 3 -
.../etl/domain/metadata/HeraMetaDataPortModel.java | 3 -
.../etl/domain/metadata/HeraMetaDataType.java | 3 -
.../ozhera/trace/etl/domain/tracequery/Span.java | 3 +-
.../ozhera/trace/etl/domain/tracequery/Trace.java | 3 +-
.../etl/domain/tracequery/TraceIdQueryVo.java | 3 +-
.../etl/domain/tracequery/TraceListQueryVo.java | 3 +-
.../etl/domain/tracequery/TraceOperationsVo.java | 3 +-
.../etl/domain/tracequery/TraceQueryResult.java | 3 +-
.../etl/es/bootstrap/TraceEtlEsBootstrap.java | 3 -
.../trace/etl/es/config/ServiceConfiguration.java | 1 -
.../ozhera/trace/etl/es/config/TraceConfig.java | 1 -
.../trace/etl/es/consumer/ConsumerService.java | 5 -
.../etl/es/consumer/KafkaTraceSpanConsumer.java | 1 -
.../etl/es/consumer/RocketMQTraceSpanConsumer.java | 1 -
.../ozhera/trace/etl/es/domain/FilterResult.java | 1 -
.../ozhera/trace/etl/es/domain/FutureRequest.java | 1 -
.../ozhera/trace/etl/es/domain/LocalStorages.java | 1 -
.../trace/etl/es/dubbo/TraceEtlServiceImpl.java | 1 -
.../etl/extension/doris/QueryDorisService.java | 3 +-
.../trace/etl/extension/es/QueryEsService.java | 3 +-
.../etl/extension/rocketmq/ClientMessageQueue.java | 3 +-
.../rocketmq/ClientMessageQueueWrapper.java | 3 +-
.../bootstrap/TraceEtlManagerBootstrap.java | 3 -
.../etl/manager/config/FilterConfiguration.java | 3 +-
.../etl/manager/config/ServiceConfiguration.java | 3 +-
.../etl/manager/controller/ManagerController.java | 3 +-
.../etl/manager/controller/TraceController.java | 3 +-
.../etl/manager/dubbo/TraceManagerServiceImpl.java | 3 +-
.../etl/manager/dubbo/TraceQueryServiceImpl.java | 4 -
.../etl/manager/filter/RequestHeaderFilter.java | 3 +-
.../bootstrap/TraceEtlMetadataBootstrap.java | 3 -
.../metadata/dubbo/HeraMetaDataServiceImpl.java | 4 -
.../etl/metadata/mq/KafkaHeraMetaDataConsumer.java | 3 -
.../metadata/mq/RocketMQHeraMetaDataConsumer.java | 3 -
.../nginx/bootstrap/TraceEtlNginxBootstrap.java | 3 -
.../etl/nginx/parser/NginxLogToTraceBase.java | 1 -
trace-etl/trace-etl-server/README.md | 20 +-
trace-etl/trace-etl-server/README_CN.md | 21 +-
.../trace/etl/bootstrap/TraceEtlBootstrap.java | 3 -
.../trace/etl/config/ServiceConfiguration.java | 3 +-
.../ozhera/trace/etl/config/TraceConfig.java | 3 +-
.../ozhera/trace/etl/constant/MetricsName.java | 3 +-
.../apache/ozhera/trace/etl/constant/SpanKind.java | 3 +-
.../apache/ozhera/trace/etl/constant/SpanType.java | 3 +-
.../trace/etl/consumer/MetricsParseService.java | 25 +-
.../etl/consumer/RocketMQConsumerService.java | 5 -
.../trace/etl/dubbo/TraceEtlServiceImpl.java | 3 +-
.../apache/ozhera/trace/etl/test/TestConsumer.java | 3 +-
.../trace/etl/service/HeraContextService.java | 3 +-
.../ozhera/trace/etl/service/ManagerService.java | 3 +-
.../etl/service/impl/HeraContextServiceImpl.java | 3 +-
.../trace/etl/service/impl/ManagerServiceImpl.java | 3 +-
.../ozhera/trace/etl/util/pool/AsyncNotify.java | 3 +-
252 files changed, 1597 insertions(+), 468 deletions(-)
create mode 100644
ozhera-intelligence/ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/constant/Prompts.java
rename
ozhera-intelligence/{ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service
=>
ozhera-intelligence-domain/src/main/java/org/apache/ozhera/intelligence/domain/rootanalysis/constant}/RootAnalysisConst.java
(93%)
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/agents/config/AgentConfig.java
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/agents/function/TraceAnalysisFunction.java
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/main/java/org/apache/ozhera/intelligence/service/TraceAnalysisService.java
create mode 100644
ozhera-intelligence/ozhera-intelligence-service/src/test/java/org/apache/ozhera/intelligence/service/PromptServiceTest.java
create mode 100644
ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/extension/TopAppPartitioner.java
create mode 100644
ozhera-log/log-agent/src/main/java/org/apache/ozhera/log/agent/extension/nacos/AppPartitionConfigService.java
copy
ozhera-log/{log-manager/src/main/java/org/apache/ozhera/log/manager/common/exception/MilogManageException.java
=>
log-agent/src/main/java/org/apache/ozhera/log/agent/extension/nacos/NacosConfigUtil.java}
(54%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
