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.

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

Monitor release: Settled #2432

Merged
merged 37 commits into from Feb 24, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7696a46
Refactored metric scheduling mechanism
freimair Feb 1, 2019
482d44b
Refactored configuration handling
freimair Feb 1, 2019
bf66ddf
Refactored Monitor class
freimair Feb 1, 2019
7c860e0
Init proper NetworkLoad Metric
freimair Feb 3, 2019
cda8020
Do not report duplicate messages
freimair Feb 3, 2019
ca623c6
History buffer size is configurable
freimair Feb 3, 2019
bfd33a1
Only report non-zero values
freimair Feb 3, 2019
ef2bff4
NetworkLoadSnapshot metric delivers diff metrics
freimair Feb 3, 2019
9266fd8
Remove wrongly placed connection shutdown operations
freimair Feb 3, 2019
051568f
Remove superfluous message listener removal
freimair Feb 3, 2019
05554f4
Remove message listener when done
freimair Feb 3, 2019
e8530f1
MessageSnapshot Metric diffs message types
freimair Feb 5, 2019
e061f0f
Fixed byte[] set and its duplicates
freimair Feb 5, 2019
54611ca
Demo Market metrics
freimair Feb 5, 2019
e728f37
Rename NetworkLoadSnapshot
freimair Feb 5, 2019
ac65eb7
Updated readme
freimair Feb 5, 2019
0ec0faa
Add monitoring service setup info to readme
freimair Feb 5, 2019
590867b
Init PriceNodeStats
freimair Feb 6, 2019
cedd921
Fee history available
freimair Feb 6, 2019
a7a2d9a
Price history available
freimair Feb 6, 2019
70adfb9
Cleanup
freimair Feb 6, 2019
04e472e
Updated Readme
freimair Feb 6, 2019
07e4b70
Optimize price stats
freimair Feb 10, 2019
32746c7
Only monitor coins which can be traded on Bisq
freimair Feb 10, 2019
3556bbf
Readme: Graphite configuration details
freimair Feb 10, 2019
315b79e
Init peer storage
freimair Feb 12, 2019
14c89f1
Normalize NetworkLoad data to messages per minute
freimair Feb 12, 2019
29083f5
Cleanup
freimair Feb 12, 2019
6a6651d
Add bisq-monitor.service file
freimair Feb 12, 2019
a8e6124
Ignore dash, ltc, doge tx fees
freimair Feb 14, 2019
2440690
Monitor can be configured for BTC_TESTNET
freimair Feb 15, 2019
c67a97f
Unify tor working dirs
freimair Feb 15, 2019
3b98633
Add all capabilities to requests
freimair Feb 15, 2019
aeda34b
Refactored report prefix
freimair Feb 15, 2019
33fe388
Monitor Release: Settled
freimair Feb 18, 2019
f12c4bd
Disable monitor tests
freimair Feb 18, 2019
3ce1243
Only add capability where it is needed
freimair Feb 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions monitor/src/main/java/bisq/monitor/Metric.java
Expand Up @@ -94,10 +94,6 @@ public void configure(final Properties properties) {

Version.setBaseCryptoNetworkId(Integer.parseInt(properties.getProperty("System." + BASE_CURRENCY_NETWORK, "1"))); // defaults to BTC_TESTNET

// add all capabilities
if(Capabilities.getSupportedCapabilities().isEmpty())
Arrays.stream(Capabilities.Capability.values()).forEach(capability -> Capabilities.addCapability(capability.ordinal()));

// decide whether to enable or disable the task
if (configuration.isEmpty() || !configuration.getProperty("enabled", "false").equals("true")
|| !configuration.containsKey(INTERVAL)) {
Expand Down
5 changes: 5 additions & 0 deletions monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java
Expand Up @@ -31,6 +31,7 @@
import org.springframework.core.env.PropertySource;

import bisq.common.Clock;
import bisq.common.app.Capabilities;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
Expand Down Expand Up @@ -136,6 +137,10 @@ public void configure(Properties properties) {
super.configure(properties);

history = Collections.synchronizedMap(new FixedSizeHistoryTracker(Integer.parseInt(configuration.getProperty(HISTORY_SIZE, "200"))));

// add all capabilities
if(!Capabilities.getSupportedCapabilities().contains(Capabilities.Capability.DAO_FULL_NODE.ordinal()))
Capabilities.addCapability(Capabilities.Capability.DAO_FULL_NODE.ordinal());
}

@Override
Expand Down