wu-sheng commented on a change in pull request #6176:
URL: https://github.com/apache/skywalking/pull/6176#discussion_r571585258
##########
File path:
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Expression.java
##########
@@ -105,12 +106,11 @@ public SampleFamily propertyMissing(String metricName) {
return SampleFamily.EMPTY;
}
if (sampleFamilies.containsKey(metricName)) {
+ ExpressionParsingContext.get().ifPresent(ctx ->
ctx.samples.add(metricName));
return sampleFamilies.get(metricName);
}
- if (!ExpressionParsingContext.get().isPresent()) {
- log.warn("{} referred by \"{}\" doesn't exist in {}",
metricName, literal, sampleFamilies.keySet());
- }
- return SampleFamily.EMPTY;
+ // Using finder, support "."
+ return new SampleFamilyFinder(metricName, literal,
sampleFamilies);
Review comment:
Do you mean, `is there is no method found than failing back to a sample
name including dot?`?
##########
File path: docs/en/setup/backend/backend-zabbix.md
##########
@@ -0,0 +1,70 @@
+# Zabbix Receiver
+Zabbix receiver is accepting the metrics of [Zabbix Agent Active Checks
protocol](https://www.zabbix.com/documentation/current/manual/appendix/items/activepassive#active_checks)
fromat into the [Meter System](./../../concepts-and-designs/meter.md).
+
+## Module define
+```yaml
+receiver-zabbix:
+ selector: ${SW_RECEIVER_METER:default}
+ default:
+ # Export tcp port, Zabbix agent could connected and transport data
+ port: 13800
+ # Enable config when receive agent request
+ activeFiles: agent
+```
+
+## Configuration file
+Zabbix receiver is configured via a configuration file. The configuration file
defines everything related to receiving
+ from agents, as well as which rule files to load.
+
+OAP can load the configuration at bootstrap. If the new configuration is not
well-formed, OAP fails to start up. The files
+are located at `$CLASSPATH/zabbix-rules`.
+
+The file is written in YAML format, defined by the scheme described below.
Brackets indicate that a parameter is optional.
+
+A example for zabbix agent configuration could be found
[here](../../../../test/e2e/e2e-test/docker/zabbix/zabbix_agentd.conf).
Review comment:
Why is the example targeting the test folder? Rather than the real
distribution file?
##########
File path: docs/en/setup/backend/backend-receivers.md
##########
@@ -20,6 +20,7 @@ We have following receivers, and `default` implementors are
provided in our Apac
1. Experimental receivers. All following receivers are in the POC stage, not
production ready.
1. **receiver_zipkin**. See [details](#zipkin-receiver). (Experimental)
1. **receiver_jaeger**. See [details](#jaeger-receiver). (Experimental)
+1. **receiver-zabbix**. See [details](backend-zabbix.md).
Review comment:
Move this before `Experimental receivers`.
##########
File path:
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Expression.java
##########
@@ -105,12 +106,11 @@ public SampleFamily propertyMissing(String metricName) {
return SampleFamily.EMPTY;
}
if (sampleFamilies.containsKey(metricName)) {
+ ExpressionParsingContext.get().ifPresent(ctx ->
ctx.samples.add(metricName));
return sampleFamilies.get(metricName);
}
- if (!ExpressionParsingContext.get().isPresent()) {
- log.warn("{} referred by \"{}\" doesn't exist in {}",
metricName, literal, sampleFamilies.keySet());
- }
- return SampleFamily.EMPTY;
+ // Using finder, support "."
+ return new SampleFamilyFinder(metricName, literal,
sampleFamilies);
Review comment:
If so, you are facing conflict with Prometheus and Telemetry rules.
##########
File path: docs/en/setup/backend/backend-zabbix.md
##########
@@ -0,0 +1,70 @@
+# Zabbix Receiver
+Zabbix receiver is accepting the metrics of [Zabbix Agent Active Checks
protocol](https://www.zabbix.com/documentation/current/manual/appendix/items/activepassive#active_checks)
fromat into the [Meter System](./../../concepts-and-designs/meter.md).
+
+## Module define
+```yaml
+receiver-zabbix:
+ selector: ${SW_RECEIVER_METER:default}
+ default:
+ # Export tcp port, Zabbix agent could connected and transport data
+ port: 13800
Review comment:
What is Zabbix server's traditional port?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
