This is an automated email from the ASF dual-hosted git repository.

dingtao pushed a change to branch trace-etl-optimize
in repository https://gitbox.apache.org/repos/asf/ozhera.git


    from fca702a2 feat: add trace downgrade strategy switch (#592)
     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 0f608005 fix: fix the type parameter of the hera App (#591)
     add b7b2bd35 feat: add the function of ai log analysis (#593)
     add 6e45d594 Merge branch 'master' into intelligence-front-end
     add 127622e3 feat: merge Intelligence front end branch to master (#594)
     add 1b6dc48f Merge branch 'master' into trace-etl-optimize

No new revisions were added by this update.

Summary of changes:
 .../ozhera/app/api/response/AppBaseInfo.java       |   1 +
 .../ozhera/app/api/service/HeraAppService.java     |   2 +-
 .../app/dao/mapper/HeraAppBaseInfoMapper.java      |   2 +-
 .../app/service/impl/HeraAppServiceImpl.java       |  12 +-
 .../resources/mapper/HeraAppBaseInfoMapper.xml     |   9 +
 .../client/bootstrap/HeraDemoClientBootstrap.java  |   3 -
 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-log/log-manager/pom.xml                     |   5 +
 .../log/manager/controller/MilogAiController.java  |  70 ++++
 ...dMapper.java => MilogAiConversationMapper.java} |  16 +-
 .../{IpPartitionBalance.java => BotQAParam.java}   |  19 +-
 ...atisticRulst.java => AiAnalysisHistoryDTO.java} |   7 +-
 .../log/manager/model/dto/LogAiAnalysisDTO.java    |  14 +
 ...DashboardDO.java => MilogAiConversationDO.java} |  26 +-
 .../manager/model/vo/LogAiAnalysisResponse.java    |   9 +
 .../ozhera/log/manager/service/HeraAppService.java |   2 +-
 ...ateService.java => MilogAiAnalysisService.java} |  41 +-
 .../manager/service/bot/ContentSimplifyBot.java    |  88 +++++
 .../log/manager/service/bot/LogAnalysisBot.java    |  94 +++++
 .../manager/service/impl/HeraAppServiceImpl.java   |   4 +-
 .../manager/service/impl/LogTailServiceImpl.java   |   2 +-
 .../service/impl/MilogAiAnalysisServiceImpl.java   | 416 +++++++++++++++++++++
 .../src/main/resources/config.properties           |   2 +-
 ozhera-log/log-manager/src/main/resources/log.sql  |  18 +
 ...ardMapper.xml => MilogAiConversationMapper.xml} |  20 +-
 ozhera-log/pom.xml                                 |  15 +
 ..._intelligence_config_#_DEFAULT_GROUP.properties |   2 +
 .../agent/bootstrap/PrometheusAgentBootstrap.java  |   3 -
 .../java/org/apache/ozhera/webhook/Bootstrap.java  |   3 -
 .../webhook/controller/HeraWebhookController.java  |   4 -
 pom.xml                                            |   7 +
 .../trace/etl/api/service/TraceQueryService.java   |   4 -
 .../etl/es/bootstrap/TraceEtlEsBootstrap.java      |   3 -
 .../trace/etl/es/consumer/ConsumerService.java     |   5 -
 .../bootstrap/TraceEtlManagerBootstrap.java        |   3 -
 .../etl/manager/dubbo/TraceQueryServiceImpl.java   |   4 -
 .../bootstrap/TraceEtlMetadataBootstrap.java       |   3 -
 .../nginx/bootstrap/TraceEtlNginxBootstrap.java    |   3 -
 .../trace/etl/bootstrap/TraceEtlBootstrap.java     |   3 -
 .../etl/consumer/RocketMQConsumerService.java      |   5 -
 60 files changed, 1943 insertions(+), 187 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-manager/src/main/java/org/apache/ozhera/log/manager/controller/MilogAiController.java
 copy 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/mapper/{MilogAnalyseDashboardMapper.java
 => MilogAiConversationMapper.java} (75%)
 copy 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/bo/{IpPartitionBalance.java
 => BotQAParam.java} (78%)
 copy 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/dto/{StatisticRulst.java
 => AiAnalysisHistoryDTO.java} (90%)
 create mode 100644 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/dto/LogAiAnalysisDTO.java
 copy 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/pojo/{MilogAnalyseDashboardDO.java
 => MilogAiConversationDO.java} (84%)
 create mode 100644 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/model/vo/LogAiAnalysisResponse.java
 copy 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/{LogTemplateService.java
 => MilogAiAnalysisService.java} (56%)
 create mode 100644 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/bot/ContentSimplifyBot.java
 create mode 100644 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/bot/LogAnalysisBot.java
 create mode 100644 
ozhera-log/log-manager/src/main/java/org/apache/ozhera/log/manager/service/impl/MilogAiAnalysisServiceImpl.java
 copy 
ozhera-log/log-manager/src/main/resources/mapper/{MilogAnalyseDashboardMapper.xml
 => MilogAiConversationMapper.xml} (72%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to