From d233d786e7266a5d09578aaa3df54df6584240d9 Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Mon, 21 Jan 2019 21:19:50 +0300 Subject: [PATCH] fixed munin plugins for new notation --- src/currency_core/currency_config.h | 2 +- src/currency_protocol/currency_protocol_handler.inl | 6 ++++++ utils/munin_plugins/aliases | 2 +- utils/munin_plugins/alt_blocks_count | 2 +- utils/munin_plugins/block_size | 4 ++-- utils/munin_plugins/db_map_size | 2 +- utils/munin_plugins/db_transactions_count | 4 ++-- utils/munin_plugins/emission | 4 ++-- utils/munin_plugins/grey_peerlist_size | 2 +- utils/munin_plugins/hashrate | 4 ++-- utils/munin_plugins/height | 2 +- utils/munin_plugins/incoming_connections_count | 2 +- utils/munin_plugins/market | 2 +- utils/munin_plugins/outgoing_connections_count | 2 +- utils/munin_plugins/outs_stat | 2 +- utils/munin_plugins/performance_block | 2 +- utils/munin_plugins/performance_pool | 2 +- utils/munin_plugins/performance_transaction | 2 +- utils/munin_plugins/performance_transaction_inp | 2 +- utils/munin_plugins/performance_transaction_inp_loop | 2 +- .../performance_transaction_inp_loop_scan_loop | 2 +- utils/munin_plugins/pos_block_ts_shift_vs_actual | 2 +- utils/munin_plugins/pos_dif_to_total_coins | 2 +- utils/munin_plugins/pos_difficulty | 2 +- utils/munin_plugins/pow_difficulty | 2 +- utils/munin_plugins/reward | 4 ++-- utils/munin_plugins/seconds_per_blocks | 4 ++-- utils/munin_plugins/sequense_factor | 4 ++-- utils/munin_plugins/timestamps | 4 ++-- utils/munin_plugins/tx_count | 2 +- utils/munin_plugins/tx_daily_count | 2 +- utils/munin_plugins/tx_daily_volume | 2 +- utils/munin_plugins/tx_per_block | 2 +- utils/munin_plugins/tx_pool_size | 2 +- utils/munin_plugins/white_peerlist_size | 2 +- 35 files changed, 48 insertions(+), 42 deletions(-) diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 27d5adc7..78114d74 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -99,7 +99,7 @@ #define BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT 2000 //by default, blocks ids count in synchronizing #define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT 200 //by default, blocks count in blocks downloading #define BLOCKS_SYNCHRONIZING_DEFAULT_SIZE 2000000 //by default keep synchronizing packets not bigger then 2MB -#define CURRENCY_PROTOCOL_HOP_RELAX_COUNT 3 //value of hop, after which we use only announce of new block +#define CURRENCY_PROTOCOL_MAX_BLOCKS_REQUEST_COUNT 500 #define CURRENCY_ALT_BLOCK_LIVETIME_COUNT (CURRENCY_BLOCKS_PER_DAY*7)//one week diff --git a/src/currency_protocol/currency_protocol_handler.inl b/src/currency_protocol/currency_protocol_handler.inl index 040e73f6..acfa4fa4 100644 --- a/src/currency_protocol/currency_protocol_handler.inl +++ b/src/currency_protocol/currency_protocol_handler.inl @@ -357,6 +357,12 @@ namespace currency template int t_currency_protocol_handler::handle_request_get_objects(int command, NOTIFY_REQUEST_GET_OBJECTS::request& arg, currency_connection_context& context) { + if (arg.blocks.size() > CURRENCY_PROTOCOL_MAX_BLOCKS_REQUEST_COUNT) + { + LOG_ERROR_CCONTEXT("Requested objects count is to big (" << arg.blocks.size() <<")expected not more then " << CURRENCY_PROTOCOL_MAX_BLOCKS_REQUEST_COUNT); + m_p2p->drop_connection(context); + } + NOTIFY_RESPONSE_GET_OBJECTS::request rsp; if(!m_core.handle_get_objects(arg, rsp, context)) { diff --git a/utils/munin_plugins/aliases b/utils/munin_plugins/aliases index 5c4d3bf7..97703ef0 100644 --- a/utils/munin_plugins/aliases +++ b/utils/munin_plugins/aliases @@ -12,4 +12,4 @@ EOM esac printf "alias_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep alias_count | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep alias_count | cut -d ' ' -f2 diff --git a/utils/munin_plugins/alt_blocks_count b/utils/munin_plugins/alt_blocks_count index 2704dd2c..4663b17a 100644 --- a/utils/munin_plugins/alt_blocks_count +++ b/utils/munin_plugins/alt_blocks_count @@ -12,4 +12,4 @@ EOM esac printf "alt_blocks_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep alt_blocks_count | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep alt_blocks_count | cut -d ' ' -f2 diff --git a/utils/munin_plugins/block_size b/utils/munin_plugins/block_size index 0b98d800..35e5782b 100644 --- a/utils/munin_plugins/block_size +++ b/utils/munin_plugins/block_size @@ -13,6 +13,6 @@ EOM esac printf "last_block_size.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000800" | grep last_block_size| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000800" | grep last_block_size| cut -d ' ' -f2 printf "current_max_allowed_block_size.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep current_max_allowed_block_size| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep current_max_allowed_block_size| cut -d ' ' -f2 diff --git a/utils/munin_plugins/db_map_size b/utils/munin_plugins/db_map_size index f232dfb1..2d3a530d 100644 --- a/utils/munin_plugins/db_map_size +++ b/utils/munin_plugins/db_map_size @@ -13,4 +13,4 @@ EOM esac printf "db_map_size.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000010000" | grep db_map_size | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000010000" | grep db_map_size | cut -d ' ' -f2 diff --git a/utils/munin_plugins/db_transactions_count b/utils/munin_plugins/db_transactions_count index 6dd0479e..66e13434 100644 --- a/utils/munin_plugins/db_transactions_count +++ b/utils/munin_plugins/db_transactions_count @@ -13,6 +13,6 @@ EOM esac printf "db_tx_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000010000" | grep db_tx_count | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000010000" | grep db_tx_count | cut -d ' ' -f2 printf "writer_tx_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000010000" | grep db_writer_tx_count| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000010000" | grep db_writer_tx_count| cut -d ' ' -f2 diff --git a/utils/munin_plugins/emission b/utils/munin_plugins/emission index ccca55c2..a3f735e5 100644 --- a/utils/munin_plugins/emission +++ b/utils/munin_plugins/emission @@ -13,6 +13,6 @@ EOM esac printf "total_coins.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000400" | grep total_coins| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000400" | grep total_coins| cut -d ' ' -f2 printf "pos_diff_in_coins.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000001" | grep pos_difficulty_in_coins| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000001" | grep pos_difficulty_in_coins| cut -d ' ' -f2 diff --git a/utils/munin_plugins/grey_peerlist_size b/utils/munin_plugins/grey_peerlist_size index 4452b11b..60351c42 100644 --- a/utils/munin_plugins/grey_peerlist_size +++ b/utils/munin_plugins/grey_peerlist_size @@ -12,4 +12,4 @@ EOM esac printf "grey_peerlist_size.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep grey_peerlist_size | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep grey_peerlist_size | cut -d ' ' -f2 diff --git a/utils/munin_plugins/hashrate b/utils/munin_plugins/hashrate index e7093e03..14385f4f 100644 --- a/utils/munin_plugins/hashrate +++ b/utils/munin_plugins/hashrate @@ -13,6 +13,6 @@ EOM esac printf "hashrate_50.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000008" | grep current_network_hashrate_50 | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000008" | grep current_network_hashrate_50 | cut -d ' ' -f2 printf "hashrate_350.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000010" | grep current_network_hashrate_350 | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000010" | grep current_network_hashrate_350 | cut -d ' ' -f2 diff --git a/utils/munin_plugins/height b/utils/munin_plugins/height index a84b349c..e76e6d05 100644 --- a/utils/munin_plugins/height +++ b/utils/munin_plugins/height @@ -13,4 +13,4 @@ EOM esac printf "height.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep height | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep height | cut -d ' ' -f2 diff --git a/utils/munin_plugins/incoming_connections_count b/utils/munin_plugins/incoming_connections_count index 9749a930..5536d08b 100644 --- a/utils/munin_plugins/incoming_connections_count +++ b/utils/munin_plugins/incoming_connections_count @@ -12,4 +12,4 @@ EOM esac printf "incoming_connections_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep incoming_connections_count | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep incoming_connections_count | cut -d ' ' -f2 diff --git a/utils/munin_plugins/market b/utils/munin_plugins/market index 0f3734d6..78e4013c 100644 --- a/utils/munin_plugins/market +++ b/utils/munin_plugins/market @@ -12,4 +12,4 @@ EOM esac printf "offers_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000010000" | grep market_size| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000010000" | grep market_size| cut -d ' ' -f2 diff --git a/utils/munin_plugins/outgoing_connections_count b/utils/munin_plugins/outgoing_connections_count index bee61b26..c16813e7 100644 --- a/utils/munin_plugins/outgoing_connections_count +++ b/utils/munin_plugins/outgoing_connections_count @@ -12,4 +12,4 @@ EOM esac printf "outgoing_connections_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep outgoing_connections_count | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep outgoing_connections_count | cut -d ' ' -f2 diff --git a/utils/munin_plugins/outs_stat b/utils/munin_plugins/outs_stat index c65b6185..a1b22d01 100644 --- a/utils/munin_plugins/outs_stat +++ b/utils/munin_plugins/outs_stat @@ -22,7 +22,7 @@ EOM exit 0;; esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000008000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000008000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "outs_0_001.value " diff --git a/utils/munin_plugins/performance_block b/utils/munin_plugins/performance_block index d8af8523..dd7bc3a4 100644 --- a/utils/munin_plugins/performance_block +++ b/utils/munin_plugins/performance_block @@ -35,7 +35,7 @@ EOM exit 0;; esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000010000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000010000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "block_processing_time_0.value " diff --git a/utils/munin_plugins/performance_pool b/utils/munin_plugins/performance_pool index 3b80f2ec..de6ec65c 100644 --- a/utils/munin_plugins/performance_pool +++ b/utils/munin_plugins/performance_pool @@ -35,7 +35,7 @@ EOM esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000010000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000010000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "pool_tx_processing_time.value " diff --git a/utils/munin_plugins/performance_transaction b/utils/munin_plugins/performance_transaction index 19cf9f3b..84748813 100644 --- a/utils/munin_plugins/performance_transaction +++ b/utils/munin_plugins/performance_transaction @@ -37,7 +37,7 @@ EOM exit 0;; esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000010000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000010000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "tx_add_one_tx_time.value " diff --git a/utils/munin_plugins/performance_transaction_inp b/utils/munin_plugins/performance_transaction_inp index 44c416da..1feaf016 100644 --- a/utils/munin_plugins/performance_transaction_inp +++ b/utils/munin_plugins/performance_transaction_inp @@ -16,7 +16,7 @@ EOM exit 0;; esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000010000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000010000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "tx_check_inputs_prefix_hash.value " diff --git a/utils/munin_plugins/performance_transaction_inp_loop b/utils/munin_plugins/performance_transaction_inp_loop index 7197269a..e0b8f602 100644 --- a/utils/munin_plugins/performance_transaction_inp_loop +++ b/utils/munin_plugins/performance_transaction_inp_loop @@ -20,7 +20,7 @@ EOM exit 0;; esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000010000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000010000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "tx_check_inputs_loop_kimage_check.value " diff --git a/utils/munin_plugins/performance_transaction_inp_loop_scan_loop b/utils/munin_plugins/performance_transaction_inp_loop_scan_loop index a04788e0..9e95c2b1 100644 --- a/utils/munin_plugins/performance_transaction_inp_loop_scan_loop +++ b/utils/munin_plugins/performance_transaction_inp_loop_scan_loop @@ -16,7 +16,7 @@ EOM exit 0;; esac -CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --getinfo_flags_hex=0x0000000000010000 --rpc_get_daemon_info)" +CONN_TOOL_OUT="$(connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --getinfo-flags-hex=0x0000000000010000 --rpc-get-daemon-info)" # printf "$CONN_TOOL_OUT" printf "tx_check_inputs_loop_scan_outputkeys_loop_get_subitem.value " diff --git a/utils/munin_plugins/pos_block_ts_shift_vs_actual b/utils/munin_plugins/pos_block_ts_shift_vs_actual index af1bb767..2829d37f 100644 --- a/utils/munin_plugins/pos_block_ts_shift_vs_actual +++ b/utils/munin_plugins/pos_block_ts_shift_vs_actual @@ -14,4 +14,4 @@ EOM esac printf "pos_block_ts_shift_vs_actual.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000020000" | grep pos_block_ts_shift_vs_actual | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000020000" | grep pos_block_ts_shift_vs_actual | cut -d ' ' -f2 diff --git a/utils/munin_plugins/pos_dif_to_total_coins b/utils/munin_plugins/pos_dif_to_total_coins index 44761d31..b1813adc 100644 --- a/utils/munin_plugins/pos_dif_to_total_coins +++ b/utils/munin_plugins/pos_dif_to_total_coins @@ -12,4 +12,4 @@ EOM esac printf "pos_diff_to_total_coins.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000401" | grep pos_diff_total_coins_rate| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000401" | grep pos_diff_total_coins_rate| cut -d ' ' -f2 diff --git a/utils/munin_plugins/pos_difficulty b/utils/munin_plugins/pos_difficulty index 000b3183..4fd68ddb 100644 --- a/utils/munin_plugins/pos_difficulty +++ b/utils/munin_plugins/pos_difficulty @@ -14,4 +14,4 @@ EOM esac printf "pos_difficulty.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000001" | grep pos_difficulty | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000001" | grep pos_difficulty | cut -d ' ' -f2 diff --git a/utils/munin_plugins/pow_difficulty b/utils/munin_plugins/pow_difficulty index 6de142f3..9388ae3c 100644 --- a/utils/munin_plugins/pow_difficulty +++ b/utils/munin_plugins/pow_difficulty @@ -13,4 +13,4 @@ EOM esac printf "pow_difficulty.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000002" | grep pow_difficulty | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000002" | grep pow_difficulty | cut -d ' ' -f2 diff --git a/utils/munin_plugins/reward b/utils/munin_plugins/reward index a0c42d2a..76ee488b 100644 --- a/utils/munin_plugins/reward +++ b/utils/munin_plugins/reward @@ -14,6 +14,6 @@ EOM esac printf "block_reward.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000401" | grep block_reward| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000401" | grep block_reward| cut -d ' ' -f2 printf "last_block_reward.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000401" | grep last_block_total_reward| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000401" | grep last_block_total_reward| cut -d ' ' -f2 diff --git a/utils/munin_plugins/seconds_per_blocks b/utils/munin_plugins/seconds_per_blocks index 4f9c65ef..bae5da3a 100644 --- a/utils/munin_plugins/seconds_per_blocks +++ b/utils/munin_plugins/seconds_per_blocks @@ -13,6 +13,6 @@ EOM esac printf "seconds_per_10_blocks.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000020" | grep seconds_between_10_blocks | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000020" | grep seconds_between_10_blocks | cut -d ' ' -f2 printf "seconds_per_30_blocks.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000040" | grep seconds_between_30_blocks | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000040" | grep seconds_between_30_blocks | cut -d ' ' -f2 diff --git a/utils/munin_plugins/sequense_factor b/utils/munin_plugins/sequense_factor index b7a6e86f..0db780ed 100644 --- a/utils/munin_plugins/sequense_factor +++ b/utils/munin_plugins/sequense_factor @@ -13,6 +13,6 @@ EOM esac printf "pos_sequense_factor.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000002000" | grep pos_sequense_factor | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000002000" | grep pos_sequense_factor | cut -d ' ' -f2 printf "pow_sequense_factor.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000004000" | grep pow_sequense_factor | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000004000" | grep pow_sequense_factor | cut -d ' ' -f2 diff --git a/utils/munin_plugins/timestamps b/utils/munin_plugins/timestamps index aadf4fb2..d06c6a4d 100644 --- a/utils/munin_plugins/timestamps +++ b/utils/munin_plugins/timestamps @@ -14,6 +14,6 @@ EOM esac printf "last_pos_timestamp.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000100" | grep last_pos_timestamp | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000100" | grep last_pos_timestamp | cut -d ' ' -f2 printf "last_pow_timestamp.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000200" | grep last_pow_timestamp | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000200" | grep last_pow_timestamp | cut -d ' ' -f2 diff --git a/utils/munin_plugins/tx_count b/utils/munin_plugins/tx_count index 5b4e4cf9..f5ba7284 100644 --- a/utils/munin_plugins/tx_count +++ b/utils/munin_plugins/tx_count @@ -13,4 +13,4 @@ EOM esac printf "tx_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep tx_count| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep tx_count| cut -d ' ' -f2 diff --git a/utils/munin_plugins/tx_daily_count b/utils/munin_plugins/tx_daily_count index c133b55c..97b79bfa 100644 --- a/utils/munin_plugins/tx_daily_count +++ b/utils/munin_plugins/tx_daily_count @@ -12,4 +12,4 @@ EOM esac printf "tx_daily_count.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000080" | grep transactions_cnt_per_day | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000080" | grep transactions_cnt_per_day | cut -d ' ' -f2 diff --git a/utils/munin_plugins/tx_daily_volume b/utils/munin_plugins/tx_daily_volume index 37cceda3..4f69878a 100644 --- a/utils/munin_plugins/tx_daily_volume +++ b/utils/munin_plugins/tx_daily_volume @@ -12,4 +12,4 @@ EOM esac printf "tx_daily_volume.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000080" | grep transactions_volume_per_day | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000080" | grep transactions_volume_per_day | cut -d ' ' -f2 diff --git a/utils/munin_plugins/tx_per_block b/utils/munin_plugins/tx_per_block index c94d5dd9..6f1dc9f0 100644 --- a/utils/munin_plugins/tx_per_block +++ b/utils/munin_plugins/tx_per_block @@ -12,6 +12,6 @@ EOM esac printf "tx_per_block.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000001000" | grep tx_count_in_last_block| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000001000" | grep tx_count_in_last_block| cut -d ' ' -f2 diff --git a/utils/munin_plugins/tx_pool_size b/utils/munin_plugins/tx_pool_size index 368cad0a..222e44de 100644 --- a/utils/munin_plugins/tx_pool_size +++ b/utils/munin_plugins/tx_pool_size @@ -12,4 +12,4 @@ EOM esac printf "tx_pool_size.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep tx_pool_size| cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep tx_pool_size| cut -d ' ' -f2 diff --git a/utils/munin_plugins/white_peerlist_size b/utils/munin_plugins/white_peerlist_size index 9887b633..881d1bc3 100644 --- a/utils/munin_plugins/white_peerlist_size +++ b/utils/munin_plugins/white_peerlist_size @@ -12,4 +12,4 @@ EOM esac printf "white_peerlist_size.value " -connectivity_tool --ip=127.0.0.1 --rpc_port=$ZANO_RPC_PORT --timeout=1000 --rpc_get_daemon_info --getinfo_flags_hex="0x0000000000000000" | grep white_peerlist_size | cut -d ' ' -f2 +connectivity_tool --ip=127.0.0.1 --rpc-port=$ZANO_RPC_PORT --timeout=1000 --rpc-get-daemon-info --getinfo-flags-hex="0x0000000000000000" | grep white_peerlist_size | cut -d ' ' -f2