Merged in development (pull request #13)
Improve robustness, logging and example dashboards
This commit is contained in:
commit
75c15f3fc9
202
LICENSE
Normal file
202
LICENSE
Normal file
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
|
@ -1,10 +1,12 @@
|
|||
# System Monitor
|
||||
|
||||
Java based system monitoring solution with support for plugins.
|
||||
This software is free to use and is licensed under the [Apache 2.0 License](LICENSE).
|
||||
|
||||
- Example dashboards are provided in the [doc/](doc) folder, which can be imported into your Grafana installation.
|
||||
- Screenshots are available in the [downloads](https://bitbucket.org/mnellemann/sysmon/downloads/) section.
|
||||
|
||||
|
||||
|
||||
## Components
|
||||
|
||||
### Client
|
||||
|
|
@ -15,13 +17,13 @@ Runs on your hosts and collects metrics, which are sent to the central *server*.
|
|||
|
||||
### Server
|
||||
|
||||
Receives aggregated metrics from clients and saves these into InfluxDB.
|
||||
Receives aggregated metrics from *clients* and saves these into InfluxDB.
|
||||
|
||||
[More information](server/README.md).
|
||||
|
||||
### Plugins
|
||||
|
||||
Loaded by the client and provides extensions for doing the actual collecting of metrics.
|
||||
Loaded by the *client* and provides extensions for doing the actual collecting of metrics.
|
||||
|
||||
[More information](plugins/README.md).
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public class ClientRouteBuilder extends RouteBuilder {
|
|||
|
||||
// Load configuration if available
|
||||
if(configuration.isForExtension(name)) {
|
||||
log.info(">>> Loading configuring for extension: " + ext.getDescription());
|
||||
log.info("Loading configuring for extension: " + ext.getDescription());
|
||||
ext.setConfiguration(configuration.getForExtension(name));
|
||||
}
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ public class ClientRouteBuilder extends RouteBuilder {
|
|||
continue;
|
||||
}
|
||||
|
||||
log.info(">>> Enabling extension: " + ext.getDescription());
|
||||
log.info("Enabling extension: " + ext.getDescription());
|
||||
providers.add(provides);
|
||||
|
||||
// Setup Camel route for this extension
|
||||
|
|
@ -72,25 +72,29 @@ public class ClientRouteBuilder extends RouteBuilder {
|
|||
.log("${body}")
|
||||
.to("seda:metrics?discardWhenFull=true");
|
||||
} else {
|
||||
log.info(">>> Skipping extension (not supported or disabled): " + ext.getDescription());
|
||||
log.info("Skipping extension (not supported or disabled): " + ext.getDescription());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
from("seda:metrics")
|
||||
from("seda:metrics?purgeWhenStopping=true")
|
||||
.aggregate(constant(true), AggregationStrategies.beanAllowNull(ComboAppender.class, "append"))
|
||||
//.aggregate(new GroupedExchangeAggregationStrategy()).constant(true)
|
||||
//.aggregate(constant(true), new ListOfResultsStrategy())
|
||||
// wait for 5 seconds to aggregate
|
||||
.completionTimeout(5000L).to("seda:outbound");
|
||||
.completionTimeout(5000L)
|
||||
.doTry()
|
||||
.to("seda:outbound?discardWhenFull=true")
|
||||
.log("Aggregating ${body} before sending to server.")
|
||||
.doCatch(Exception.class)
|
||||
.log(LoggingLevel.WARN, "Error: ${exception.message}.")
|
||||
.end();
|
||||
|
||||
from("seda:outbound")
|
||||
from("seda:outbound?purgeWhenStopping=true")
|
||||
.setHeader(Exchange.HTTP_METHOD, constant("POST"))
|
||||
.doTry()
|
||||
.marshal(new JacksonDataFormat(ComboResult.class))
|
||||
.to((String)registry.lookupByName("myServerUrl"))
|
||||
.log("${body}")
|
||||
.doCatch(Exception.class)
|
||||
.log(LoggingLevel.WARN,"Error: ${exception.message}")
|
||||
.log(LoggingLevel.WARN,"Error: ${exception.message}.")
|
||||
.end();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,3 +30,6 @@ camel.main.name = sysmon-client
|
|||
camel.main.lightweight = true
|
||||
# and eager load classes
|
||||
#camel.main.eager-classloading = true
|
||||
|
||||
# limit the seda queue size
|
||||
camel.component.seda.queue-size=10
|
||||
|
|
@ -4,3 +4,5 @@ org.slf4j.simpleLogger.showShortLogName=true
|
|||
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS
|
||||
org.slf4j.simpleLogger.levelInBrackets=true
|
||||
org.slf4j.simpleLogger.defaultLogLevel=warn
|
||||
org.slf4j.simpleLogger.showThreadName=false
|
||||
org.slf4j.simpleLogger.showLogName=false
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -14,7 +14,7 @@
|
|||
"type": "grafana",
|
||||
"id": "grafana",
|
||||
"name": "Grafana",
|
||||
"version": "8.1.2"
|
||||
"version": "8.1.4"
|
||||
},
|
||||
{
|
||||
"type": "datasource",
|
||||
|
|
@ -34,6 +34,12 @@
|
|||
"name": "Table",
|
||||
"version": ""
|
||||
},
|
||||
{
|
||||
"type": "panel",
|
||||
"id": "text",
|
||||
"name": "Text",
|
||||
"version": ""
|
||||
},
|
||||
{
|
||||
"type": "panel",
|
||||
"id": "timeseries",
|
||||
|
|
@ -65,9 +71,26 @@
|
|||
"gnetId": null,
|
||||
"graphTooltip": 0,
|
||||
"id": null,
|
||||
"iteration": 1631256755587,
|
||||
"iteration": 1632317604857,
|
||||
"links": [],
|
||||
"panels": [
|
||||
{
|
||||
"datasource": null,
|
||||
"gridPos": {
|
||||
"h": 3,
|
||||
"w": 24,
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"id": 30,
|
||||
"options": {
|
||||
"content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information: [bitbucket.org/mnellemann/sysmon](https://bitbucket.org/mnellemann/sysmon)\n ",
|
||||
"mode": "markdown"
|
||||
},
|
||||
"pluginVersion": "8.1.4",
|
||||
"transparent": true,
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"collapsed": false,
|
||||
"datasource": null,
|
||||
|
|
@ -75,7 +98,7 @@
|
|||
"h": 1,
|
||||
"w": 24,
|
||||
"x": 0,
|
||||
"y": 0
|
||||
"y": 3
|
||||
},
|
||||
"id": 4,
|
||||
"panels": [],
|
||||
|
|
@ -113,14 +136,14 @@
|
|||
"h": 6,
|
||||
"w": 12,
|
||||
"x": 0,
|
||||
"y": 1
|
||||
"y": 4
|
||||
},
|
||||
"id": 16,
|
||||
"options": {
|
||||
"showHeader": true,
|
||||
"sortBy": []
|
||||
},
|
||||
"pluginVersion": "8.1.2",
|
||||
"pluginVersion": "8.1.4",
|
||||
"targets": [
|
||||
{
|
||||
"groupBy": [
|
||||
|
|
@ -223,7 +246,7 @@
|
|||
"fieldConfig": {
|
||||
"defaults": {
|
||||
"color": {
|
||||
"mode": "palette-classic"
|
||||
"mode": "thresholds"
|
||||
},
|
||||
"mappings": [],
|
||||
"thresholds": {
|
||||
|
|
@ -268,7 +291,7 @@
|
|||
"h": 6,
|
||||
"w": 7,
|
||||
"x": 12,
|
||||
"y": 1
|
||||
"y": 4
|
||||
},
|
||||
"id": 19,
|
||||
"options": {
|
||||
|
|
@ -286,7 +309,7 @@
|
|||
"text": {},
|
||||
"textMode": "auto"
|
||||
},
|
||||
"pluginVersion": "8.1.2",
|
||||
"pluginVersion": "8.1.4",
|
||||
"targets": [
|
||||
{
|
||||
"groupBy": [
|
||||
|
|
@ -422,7 +445,7 @@
|
|||
"h": 6,
|
||||
"w": 5,
|
||||
"x": 19,
|
||||
"y": 1
|
||||
"y": 4
|
||||
},
|
||||
"id": 26,
|
||||
"options": {
|
||||
|
|
@ -440,7 +463,7 @@
|
|||
"text": {},
|
||||
"textMode": "auto"
|
||||
},
|
||||
"pluginVersion": "8.1.2",
|
||||
"pluginVersion": "8.1.4",
|
||||
"targets": [
|
||||
{
|
||||
"groupBy": [
|
||||
|
|
@ -580,7 +603,7 @@
|
|||
"h": 11,
|
||||
"w": 12,
|
||||
"x": 0,
|
||||
"y": 7
|
||||
"y": 10
|
||||
},
|
||||
"id": 24,
|
||||
"options": {
|
||||
|
|
@ -755,7 +778,7 @@
|
|||
"h": 11,
|
||||
"w": 12,
|
||||
"x": 12,
|
||||
"y": 7
|
||||
"y": 10
|
||||
},
|
||||
"id": 25,
|
||||
"options": {
|
||||
|
|
@ -953,5 +976,5 @@
|
|||
"timezone": "",
|
||||
"title": "Sysmon - Process Explorer",
|
||||
"uid": "Vjut5mS7k",
|
||||
"version": 15
|
||||
"version": 18
|
||||
}
|
||||
BIN
doc/monitoring-eye-svgrepo-com.png
Normal file
BIN
doc/monitoring-eye-svgrepo-com.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
74
doc/monitoring-eye-svgrepo-com.svg
Normal file
74
doc/monitoring-eye-svgrepo-com.svg
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
|
||||
<polygon style="fill:#88ACB5;" points="306.111,381.102 306.111,435.57 256,457.357 205.889,435.57 205.889,381.102 "/>
|
||||
<g>
|
||||
<rect x="205.889" y="435.571" style="fill:#A7CBCF;" width="100.221" height="49.564"/>
|
||||
<path style="fill:#A7CBCF;" d="M492.566,26.09h-32.681v336.471l43.945-21.787V37.354C503.83,31.166,498.764,26.09,492.566,26.09z"
|
||||
/>
|
||||
</g>
|
||||
<path style="fill:#C7E7EB;" d="M459.885,26.09H19.434c-6.198,0-11.264,5.076-11.264,11.264v303.42l32.681,21.787h430.298V37.354
|
||||
C471.149,31.166,466.083,26.09,459.885,26.09z"/>
|
||||
<path style="fill:#367596;" d="M471.149,340.774l-11.264,66.473h32.681c6.198,0,11.264-5.066,11.264-11.264v-55.209H471.149z"/>
|
||||
<path style="fill:#5195AF;" d="M8.17,340.774v55.209c0,6.198,5.066,11.264,11.264,11.264h440.451
|
||||
c6.198,0,11.264-5.066,11.264-11.264v-55.209H8.17z"/>
|
||||
<path style="fill:#FFFFFF;" d="M256,69.668c-84.662,0-158.638,45.698-198.646,113.764C97.361,251.498,171.338,297.197,256,297.197
|
||||
s158.639-45.698,198.646-113.764C414.638,115.366,340.662,69.668,256,69.668z"/>
|
||||
<path style="fill:#27467A;" d="M256,69.668v227.528c62.881,0,113.764-50.883,113.764-113.764S318.881,69.668,256,69.668z"/>
|
||||
<path style="fill:#367596;" d="M256,69.667c-62.881,0-113.764,50.883-113.764,113.764S193.119,297.196,256,297.196
|
||||
c44.817,0,81.083-50.883,81.083-113.764S300.817,69.667,256,69.667z"/>
|
||||
<circle style="fill:#111449;" cx="256" cy="183.34" r="46.298"/>
|
||||
<path d="M492.565,17.826H19.435C8.718,17.826,0,26.544,0,37.261v358.623c0,10.717,8.718,19.435,19.435,19.435H197.88v62.515h-77.06
|
||||
c-4.512,0-8.17,3.657-8.17,8.17c0,4.513,3.658,8.17,8.17,8.17h270.36c4.513,0,8.17-3.657,8.17-8.17c0-4.513-3.657-8.17-8.17-8.17
|
||||
h-77.059V415.32h178.445c10.717,0,19.435-8.718,19.435-19.435V37.261C512,26.544,503.282,17.826,492.565,17.826z M297.779,477.835
|
||||
H214.22V415.32h83.559V477.835z M495.66,395.884c0,1.678-1.417,3.095-3.095,3.095H19.435c-1.678,0-3.095-1.417-3.095-3.095V37.261
|
||||
c0-1.678,1.417-3.095,3.095-3.095h473.129c1.678,0,3.095,1.417,3.095,3.095V395.884z"/>
|
||||
<path d="M470.036,332.504H41.965c-4.512,0-8.17,3.657-8.17,8.17c0,4.513,3.658,8.17,8.17,8.17h428.07c4.513,0,8.17-3.657,8.17-8.17
|
||||
C478.206,336.161,474.548,332.504,470.036,332.504z"/>
|
||||
<path d="M135.806,272.794C172.129,294.04,213.691,305.27,256,305.27c42.31,0,83.871-11.23,120.194-32.476
|
||||
c35.241-20.612,64.804-50.115,85.496-85.318c1.502-2.557,1.502-5.725,0-8.281c-20.692-35.203-50.257-64.706-85.496-85.319
|
||||
C339.871,72.63,298.31,61.4,256,61.4s-83.872,11.23-120.194,32.475c-35.241,20.613-64.805,50.116-85.496,85.319
|
||||
c-1.502,2.557-1.502,5.725,0,8.281C71.001,222.679,100.566,252.182,135.806,272.794z M252.818,288.877
|
||||
c-56.759-1.689-102.412-48.382-102.412-105.542c0-57.161,45.654-103.854,102.412-105.543c1.061-0.015,2.119-0.052,3.182-0.052
|
||||
c1.063,0,2.121,0.037,3.182,0.052c56.758,1.689,102.412,48.382,102.412,105.543c0,57.16-45.654,103.852-102.412,105.542
|
||||
c-1.061,0.015-2.119,0.052-3.182,0.052C254.937,288.93,253.879,288.893,252.818,288.877z M445.109,183.336
|
||||
c-25.232,40.845-62.884,71.925-106.353,89.465c24.078-22.288,39.179-54.143,39.179-89.465s-15.102-67.177-39.18-89.466
|
||||
C382.223,111.41,419.877,142.49,445.109,183.336z M173.246,93.87c-24.079,22.289-39.18,54.145-39.18,89.466
|
||||
c0,35.32,15.101,67.175,39.18,89.465c-43.469-17.54-81.122-48.619-106.353-89.465C92.123,142.49,129.776,111.41,173.246,93.87z"/>
|
||||
<path d="M310.379,183.335c0-7.773-1.621-15.299-4.818-22.371c-1.857-4.11-6.696-5.938-10.81-4.08
|
||||
c-4.111,1.858-5.938,6.697-4.08,10.81c2.234,4.944,3.367,10.205,3.367,15.641c0,20.975-17.064,38.038-38.038,38.038
|
||||
s-38.038-17.064-38.038-38.038s17.064-38.038,38.038-38.038c5.435,0,10.698,1.133,15.642,3.368c4.112,1.861,8.951,0.032,10.81-4.08
|
||||
c1.858-4.111,0.032-8.951-4.08-10.81c-7.073-3.198-14.601-4.819-22.372-4.819c-29.985,0-54.379,24.395-54.379,54.379
|
||||
s24.394,54.379,54.379,54.379C285.984,237.713,310.379,213.318,310.379,183.335z"/>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.2 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
version=0.1.2
|
||||
version=0.1.3
|
||||
pf4jVersion=3.6.0
|
||||
slf4jVersion=1.7.32
|
||||
camelVersion=3.11.2
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ plugins {
|
|||
|
||||
dependencies {
|
||||
// https://mvnrepository.com/artifact/net.sf.jt400/jt400
|
||||
implementation group: 'net.sf.jt400', name: 'jt400', version: '10.6'
|
||||
implementation group: 'net.sf.jt400', name: 'jt400', version: '10.7'
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ public class Application implements Callable<Integer> {
|
|||
private Integer listenPort = 9925;
|
||||
|
||||
@CommandLine.Option(names = { "-t", "--threads" }, description = "Threads for processing inbound metrics(default: ${DEFAULT-VALUE}).", paramLabel = "<num>")
|
||||
private Integer threads = 5;
|
||||
private Integer threads = 1;
|
||||
|
||||
@CommandLine.Option(names = { "-d", "--debug" }, description = "Enable debugging (default: ${DEFAULT_VALUE}).")
|
||||
private boolean enableDebug = false;
|
||||
|
|
|
|||
|
|
@ -4,19 +4,15 @@ import org.apache.camel.Exchange;
|
|||
import org.apache.camel.Processor;
|
||||
import org.influxdb.dto.BatchPoints;
|
||||
import org.influxdb.dto.Point;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import sysmon.shared.ComboResult;
|
||||
import sysmon.shared.Measurement;
|
||||
import sysmon.shared.MetricResult;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class ComboResultToPointProcessor implements Processor {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(ComboResultToPointProcessor.class);
|
||||
private static String influxDbName;
|
||||
|
||||
ComboResultToPointProcessor(String influxDbName) {
|
||||
|
|
@ -24,22 +20,17 @@ public class ComboResultToPointProcessor implements Processor {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void process(Exchange exchange) throws Exception {
|
||||
public void process(Exchange exchange) {
|
||||
|
||||
ComboResult comboResult = exchange.getIn().getBody(ComboResult.class);
|
||||
//MetricResult metricResult = exchange.getIn().getBody(MetricResult.class);
|
||||
|
||||
//log.info("Size of measurements: " + measurementList.size());
|
||||
|
||||
BatchPoints.Builder batchPoints = BatchPoints
|
||||
.database(ComboResultToPointProcessor.influxDbName)
|
||||
.precision(TimeUnit.MILLISECONDS);
|
||||
|
||||
List<MetricResult> results = comboResult.getMetricResults();
|
||||
for(MetricResult metricResult : results) {
|
||||
for(MetricResult metricResult : comboResult.getMetricResults()) {
|
||||
|
||||
List<Measurement> measurementList = metricResult.getMeasurements();
|
||||
for(Measurement measurement : measurementList) {
|
||||
for(Measurement measurement : metricResult.getMeasurements()) {
|
||||
|
||||
Point.Builder point = Point.measurement(metricResult.getName())
|
||||
.time(metricResult.getTimestamp(), TimeUnit.MILLISECONDS)
|
||||
|
|
@ -65,6 +56,7 @@ public class ComboResultToPointProcessor implements Processor {
|
|||
}
|
||||
batchPoints.point(point.build());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
exchange.getIn().setBody(batchPoints.build());
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ import org.apache.camel.Exchange;
|
|||
import org.apache.camel.Processor;
|
||||
import org.influxdb.dto.BatchPoints;
|
||||
import org.influxdb.dto.Point;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import sysmon.shared.Measurement;
|
||||
import sysmon.shared.MetricResult;
|
||||
|
||||
|
|
@ -15,7 +13,6 @@ import java.util.concurrent.TimeUnit;
|
|||
|
||||
public class MetricResultToPointProcessor implements Processor {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(MetricResultToPointProcessor.class);
|
||||
private static String influxDbName;
|
||||
|
||||
MetricResultToPointProcessor(String influxDbName) {
|
||||
|
|
|
|||
|
|
@ -40,18 +40,19 @@ public class ServerRouteBuilder extends RouteBuilder {
|
|||
.setHeader(Exchange.HTTP_RESPONSE_CODE, constant(202))
|
||||
.setHeader("Content-Type", constant("application/x-www-form-urlencoded"))
|
||||
.to("seda:inbound?discardWhenFull=true")
|
||||
.setBody(simple("OK, received by server."))
|
||||
.doCatch(Exception.class)
|
||||
.log(LoggingLevel.WARN, "Error: ${exception.message}")
|
||||
.log(LoggingLevel.WARN, "Error: ${exception.message}.")
|
||||
.end()
|
||||
.endRest();
|
||||
|
||||
fromF("seda:inbound?concurrentConsumers=%s", threads)
|
||||
.log(">>> metric: ${header.hostname} - ${body}")
|
||||
.log("From ${header.hostname}: ${body}.")
|
||||
.doTry()
|
||||
.process(new ComboResultToPointProcessor(dbname))
|
||||
.toF("influxdb://ref.myInfluxConnection?batch=true") //&retentionPolicy=autogen
|
||||
.doCatch(Exception.class)
|
||||
.log(LoggingLevel.WARN, "Error: ${exception.message}")
|
||||
.log(LoggingLevel.WARN, "Error: ${exception.message}.")
|
||||
.end();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,3 +4,5 @@ org.slf4j.simpleLogger.showShortLogName=true
|
|||
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS
|
||||
org.slf4j.simpleLogger.levelInBrackets=true
|
||||
org.slf4j.simpleLogger.defaultLogLevel=warn
|
||||
org.slf4j.simpleLogger.showThreadName=false
|
||||
org.slf4j.simpleLogger.showLogName=false
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class ComboResult implements Serializable {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ComboResult of size: " + metricResults.size();
|
||||
return metricResults.size() + " results";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,28 +75,12 @@ public class MetricResult implements Serializable {
|
|||
}
|
||||
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder(String.format("%s - %s => ", timestamp.toString(), name));
|
||||
StringBuilder sb = new StringBuilder(String.format("From %s: ", name));
|
||||
|
||||
if(measurements != null && !measurements.isEmpty()) {
|
||||
|
||||
sb.append(String.format("%d measurement(s) ", measurements.size()));
|
||||
for(Measurement m : measurements) {
|
||||
|
||||
sb.append("{ ");
|
||||
if(m != null && m.getTags() != null) {
|
||||
for (Map.Entry<String, String> entry : m.getTags().entrySet())
|
||||
sb.append(entry.getKey()).append(": ").append(entry.getValue()).append(", ");
|
||||
}
|
||||
sb.append("} ");
|
||||
|
||||
/*
|
||||
sb.append("[ ");
|
||||
if(m != null && m.getFields() != null) {
|
||||
for (Map.Entry<String,Object> entry : m.getFields().entrySet())
|
||||
sb.append(entry.getKey()).append(": ").append(entry.getValue()).append(", ");
|
||||
}
|
||||
sb.append("] ");
|
||||
*/
|
||||
|
||||
sb.append(String.format("{ tags: %d, fields: %d } ", m.getTags().size(), m.getFields().size()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue