Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: add query cache of metricinfo #838

Merged
merged 3 commits into from
Apr 16, 2024
Merged

refactor: add query cache of metricinfo #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a095d95
refactor: add query cache of metricinfo
Apr 16, 2024
bc1a11a
fix: fix license
Apr 16, 2024
e2ebce0
fix: fix cachekey of metricInfoServiceImpl
Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
291 changes: 281 additions & 10 deletions server/all-in-one/all-in-one-bootstrap/src/main/resources/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,225 @@
</Policies>
</RollingFile>

<RollingFile name="CLUSTER" fileName="${LOG_PATH}/cluster.log"
filePattern="${LOG_PATH}/cluster.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="cluster.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>

<RollingFile name="GATEWAY" fileName="${LOG_PATH}/gateway-api.log"
filePattern="${LOG_PATH}/gateway-api.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="gateway-api.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
</RollingFile>

<RollingFile name="TASK" fileName="${LOG_PATH}/home-task.log"
filePattern="${LOG_PATH}/home-task.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="home-task.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>
<RollingFile name="QUERY" fileName="${LOG_PATH}/query.log"
filePattern="${LOG_PATH}/query.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="query.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>
<RollingFile name="COMMON" fileName="${LOG_PATH}/common.log"
filePattern="${LOG_PATH}/common.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="query.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>
<RollingFile name="EXTENSION" fileName="${LOG_PATH}/extension.log"
filePattern="${LOG_PATH}/extension.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="query.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>
<RollingFile name="HOME" fileName="${LOG_PATH}/home.log"
filePattern="${LOG_PATH}/home.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="query.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>
<RollingFile name="SECURITY" fileName="${LOG_PATH}/security.log"
filePattern="${LOG_PATH}/security.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="query.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
</RollingFile>

<RollingFile name="ALERT" fileName="${LOG_PATH}/alert.log"
filePattern="${LOG_PATH}/alert.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="alert.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
</RollingFile>

<RollingFile name="ALERT-DEBUG" fileName="${LOG_PATH}/alert-debug.log"
filePattern="${LOG_PATH}/alert-debug.log.%d{yyyy-MM-dd}.%i" immediateFlush="true">
<!--打印INFO和WARN-->
<DefaultRolloverStrategy max="7">
<Delete basePath="${LOG_PATH}" maxDepth="1">
<IfAny>
<IfAccumulatedFileCount exceeds="10"/>
<IfAccumulatedFileSize exceeds="10GB"/>
<IfLastModified age="2d"/>
</IfAny>
<IfFileName glob="alert-debug.log.*"/>
</Delete>
</DefaultRolloverStrategy>
<PatternLayout charset="utf-8">
<pattern>%d %p [%t] %c{1.} - %m%n</pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="2GB"/>
<TimeBasedTriggeringPolicy modulate="true"/>
</Policies>
<ThresholdFilter level="INFO" onMatch="DENY" onMismatch="NEUTRAL"/>
<ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
</RollingFile>

</Appenders>

<Loggers>
Expand All @@ -298,9 +517,20 @@
<Logger name="SYNC" additivity="false" level="INFO">
<Appender-Ref ref="DIM"/>
</Logger>

<Logger name="AGENT" additivity="false" level="INFO">
<Appender-Ref ref="AGENT"/>
</Logger>
<Logger name="AGENT_EVENT_STAT" additivity="false" level="INFO">
<Appender-Ref ref="AGENT_EVENT_STAT"/>
</Logger>
<Logger name="AGENT_EVENT_DIGEST" additivity="false" level="INFO">
<Appender-Ref ref="AGENT_EVENT_DIGEST"/>
</Logger>
<Logger name="AGENT_EVENT_UP" additivity="false" level="INFO">
<Appender-Ref ref="AGENT_EVENT_UP"/>
</Logger>

<Logger name="BISTREAM" additivity="false" level="INFO">
<Appender-Ref ref="BISTREAM"/>
</Logger>
Expand All @@ -310,9 +540,7 @@
<Logger name="io.holoinsight.server.registry.core.grpc.streambiz" additivity="false" level="INFO">
<Appender-Ref ref="BISTREAM"/>
</Logger>
<Logger name="io.holoinsight.server.meta" additivity="false" level="INFO">
<Appender-Ref ref="DIM"/>
</Logger>

<Logger name="TARGET" additivity="false" level="INFO">
<Appender-Ref ref="TARGET"/>
</Logger>
Expand All @@ -322,18 +550,61 @@
<Logger name="STAT1S" additivity="false" level="INFO">
<Appender-Ref ref="STAT1S"/>
</Logger>
<Logger name="io.holoinsight.server.common.config.ProdLog" additivity="false" level="INFO">

<Logger name="io.holoinsight.server.extension" additivity="false" level="INFO">
<Appender-Ref ref="EXTENSION"/>
</Logger>

<Logger name="io.holoinsight.server.common" additivity="false" level="INFO">
<Appender-Ref ref="COMMON"/>
</Logger>
<Logger name="io.holoinsight.server.home.common" additivity="false" level="DEBUG">
<Appender-Ref ref="COMMON"/>
</Logger>

<Logger name="io.holoinsight.server.gateway" additivity="false" level="INFO">
<Appender-Ref ref="GATEWAY"/>
</Logger>

<Logger name="io.holoinsight.server.meta" additivity="false" level="INFO">
<Appender-Ref ref="DIM"/>
</Logger>

<Logger name="io.holoinsight.server.home.alert" additivity="false" level="DEBUG">
<Appender-Ref level="INFO" ref="ALERT"/>
<Appender-Ref level="DEBUG" ref="ALERT-DEBUG"/>
</Logger>

<Logger name="io.holoinsight.server.query" additivity="false" level="DEBUG">
<Appender-Ref ref="QUERY"/>
</Logger>
<Logger name="io.holoinsight.server.home.common.service.QueryClientService" additivity="false" level="DEBUG">
<Appender-Ref ref="QUERY"/>
</Logger>

<Logger name="io.holoinsight.server.apm" additivity="false" level="DEBUG">
<Appender-Ref ref="APM"/>
</Logger>

<Logger name="io.holoinsight.server.home.web.security" additivity="false" level="INFO">
<Appender-Ref ref="SECURITY"/>
</Logger>

<Logger name="io.holoinsight.server.home" additivity="false" level="INFO">
<Appender-Ref ref="HOME"/>
</Logger>
<Logger name="AGENT_EVENT_STAT" additivity="false" level="INFO">
<Appender-Ref ref="AGENT_EVENT_STAT"/>
<Logger name="io.holoinsight.server.common.config.ProdLog" additivity="false" level="INFO">
<Appender-Ref ref="CLUSTER"/>
</Logger>
<Logger name="AGENT_EVENT_DIGEST" additivity="false" level="INFO">
<Appender-Ref ref="AGENT_EVENT_DIGEST"/>
<Logger name="io.holoinsight.server.home.alert.service.task.coordinator" additivity="false" level="INFO">
<Appender-Ref ref="CLUSTER"/>
</Logger>
<Logger name="AGENT_EVENT_UP" additivity="false" level="INFO">
<Appender-Ref ref="AGENT_EVENT_UP"/>
<Logger name="io.holoinsight.server.home.task" additivity="false" level="DEBUG">
<Appender-Ref ref="TASK"/>
</Logger>

<Logger name="org.elasticsearch.client.RestClient" additivity="false" level="off"/>

<Logger name="io.holoinsight.server.agg" additivity="false" level="INFO">
<Appender-Ref ref="AGG"/>
<Appender-Ref ref="AGG-ERROR" level="ERROR"/>
Expand Down
3 changes: 3 additions & 0 deletions ...m-common/src/main/java/io/holoinsight/server/apm/common/model/query/StatisticRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import lombok.NoArgsConstructor;

import java.util.List;
import java.util.Map;

@Data
@AllArgsConstructor
Expand All @@ -17,4 +18,6 @@ public class StatisticRequest {
private long start;
private long end;
private List<String> groups;
private Map<String, String> whites;
private Map<String, String> blacks;
}
Loading
Loading