diff --git a/plugins/zabbix/js/zabbix.js b/plugins/zabbix/js/zabbix.js
index 0d6fa6ac1..9b47726c1 100755
--- a/plugins/zabbix/js/zabbix.js
+++ b/plugins/zabbix/js/zabbix.js
@@ -1,8 +1,8 @@
-function redisPost(method, version, args,callback){
+function zabbixPost(method, version, args,callback){
var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
var req_data = {};
- req_data['name'] = 'redis';
+ req_data['name'] = 'zabbix';
req_data['func'] = method;
req_data['version'] = version;
@@ -26,11 +26,11 @@ function redisPost(method, version, args,callback){
},'json');
}
-function redisPostCallbak(method, version, args,callback){
+function zabbixPostCallbak(method, version, args,callback){
var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
var req_data = {};
- req_data['name'] = 'redis';
+ req_data['name'] = 'zabbix';
req_data['func'] = method;
args['version'] = version;
@@ -53,232 +53,6 @@ function redisPostCallbak(method, version, args,callback){
},'json');
}
-//redis状态 start
-function redisStatus(version) {
-
- redisPost('run_info',version, {},function(data){
- var rdata = $.parseJSON(data.data);
-
- if ('status' in rdata && !rdata.status){
- layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
- return;
- }
-
- hit = (parseInt(rdata.keyspace_hits) / (parseInt(rdata.keyspace_hits) + parseInt(rdata.keyspace_misses)) * 100).toFixed(2);
- var con = '
\
-
\
- 字段 | 当前值 | 说明 | \
- \
- uptime_in_days | ' + rdata.uptime_in_days + ' | 已运行天数 |
\
- tcp_port | ' + rdata.tcp_port + ' | 当前监听端口 |
\
- connected_clients | ' + rdata.connected_clients + ' | 连接的客户端数量 |
\
- used_memory_rss | ' + toSize(rdata.used_memory_rss) + ' | Redis当前占用的系统内存总量 |
\
- used_memory | ' + toSize(rdata.used_memory) + ' | Redis当前已分配的内存总量 |
\
- used_memory_peak | ' + toSize(rdata.used_memory_peak) + ' | Redis历史分配内存的峰值 |
\
- mem_fragmentation_ratio | ' + rdata.mem_fragmentation_ratio + '% | 内存碎片比率 |
\
- total_connections_received | ' + rdata.total_connections_received + ' | 运行以来连接过的客户端的总数量 |
\
- total_commands_processed | ' + rdata.total_commands_processed + ' | 运行以来执行过的命令的总数量 |
\
- instantaneous_ops_per_sec | ' + rdata.instantaneous_ops_per_sec + ' | 服务器每秒钟执行的命令数量 |
\
- keyspace_hits | ' + rdata.keyspace_hits + ' | 查找数据库键成功的次数 |
\
- keyspace_misses | ' + rdata.keyspace_misses + ' | 查找数据库键失败的次数 |
\
- hit | ' + hit + '% | 查找数据库键命中率 |
\
- latest_fork_usec | ' + rdata.latest_fork_usec + ' | 最近一次 fork() 操作耗费的微秒数 |
\
- \
-
';
- $(".soft-man-con").html(con);
- });
-}
-
-function replStatus(version){
- redisPost('info_replication', version, {},function(data){
- var rdata = $.parseJSON(data.data);
-
- if ('status' in rdata && !rdata.status){
- layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
- return;
- }
-
- var kv = {
- 'role':'角色',
- 'master_host':'连接主库HOST',
- 'master_port':'连接主库PORT',
- 'master_link_status':'连接主库状态',
- 'master_last_io_seconds_ago':'上次同步时间',
- 'master_sync_in_progress':'正在同步中',
- 'slave_read_repl_offset':'从库读取复制位置',
- 'slave_repl_offset':'从库复制位置',
- 'slave_read_only':'从库是否仅读',
- 'replica_announced':'已复制副本',
- 'connected_slaves':'连接数量',
- 'master_failover_state':'主库故障状态',
- 'master_replid':'主库复制ID',
- 'master_repl_offset':'主库复制位置',
- 'repl_backlog_size':'backlog复制大小',
- 'second_repl_offset':'复制位置时间',
- 'repl_backlog_first_byte_offset':'第一个字节偏移量',
- 'repl_backlog_histlen':'backlog中数据的长度',
- 'repl_backlog_active':'开启复制缓冲区',
- 'slave_priority':'同步优先级',
- }
-
- var tbody_text = '';
- for (k in rdata){
- if (k == 'master_replid'){
- tbody_text += ''+k+' | ' + rdata[k] + ' | '+kv[k]+' |
';
- } else{
-
- if (k.substring(0,5) == 'slave' && !isNaN(k.substring(5))){
- tbody_text += ''+k+' | ' + rdata[k] + ' | 从库配置信息 |
';
- } else{
- tbody_text += ''+k+' | ' + rdata[k] + ' | '+kv[k]+' |
';
- }
-
-
- }
- }
-
- var con = '\
-
\
- 字段 | 当前值 | 说明 | \
- '+tbody_text+'\
-
';
- $(".soft-man-con").html(con);
- });
-}
-
-function clusterStatus(version){
- redisPost('cluster_info', version, {},function(data){
- var rdata = $.parseJSON(data.data);
-
- if ('status' in rdata && !rdata.status){
- layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
- return;
- }
-
- var kv = {
- 'cluster_state':'集群状态',
- 'cluster_slots_assigned':'被分配的槽',
- 'cluster_slots_ok':'被分配的槽状态',
- 'cluster_known_nodes':'知道的节点',
- 'cluster_size':'大小',
- 'cluster_stats_messages_sent':'发送',
- 'cluster_stats_messages_received':'接收',
- 'cluster_current_epoch':'集群当前epoch',
- 'cluster_my_epoch':'当前我的epoch',
- 'cluster_slots_pfail':'处于PFAIL状态的槽数',
- 'cluster_slots_fail':'处于FAIL状态的槽数',
- 'total_cluster_links_buffer_limit_exceeded':'超出缓冲区总数',
- }
-
- var tbody_text = '';
- for (k in rdata){
- var desc = k;
- if (k in kv){
- desc = kv[k];
- }
-
- if (k == 'master_replid'){
- tbody_text += ''+k+' | ' + rdata[k] + ' | '+desc+' |
';
- } else{
- tbody_text += ''+k+' | ' + rdata[k] + ' | '+desc+' |
';
- }
- }
-
- if (tbody_text == ''){
- tbody_text += '无数据/未设置集群 |
';
- }
-
- var con = '\
-
\
- 字段 | 当前值 | 说明 | \
- '+tbody_text+'\
-
';
- $(".soft-man-con").html(con);
- });
-}
-
-function clusterNodes(version){
- redisPost('cluster_nodes', version, {},function(data){
- var rdata = $.parseJSON(data.data);
-
- if ('status' in rdata && !rdata.status){
- layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
- return;
- }
-
- // console.log(rdata);
- var tbody_text = '';
- for (k in rdata){
- tbody_text += ''+ rdata[k] +' |
';
- }
-
- if (tbody_text == ''){
- tbody_text += '无数据/未设置集群 |
';
- }
-
- var con = '\
-
\
- 节点信息 | \
- '+tbody_text+'\
-
';
- $(".soft-man-con").html(con);
- });
-}
-
-//redis状态 end
-
-//配置修改
-function getRedisConfig(version) {
- redisPost('get_redis_conf', version,'',function(data){
- // console.log(data);
- var rdata = $.parseJSON(data.data);
- // console.log(rdata);
- var mlist = '';
- for (var i = 0; i < rdata.length; i++) {
- var w = '70'
- if (rdata[i].name == 'error_reporting') w = '250';
- var ibody = '';
- switch (rdata[i].type) {
- case 0:
- var selected_1 = (rdata[i].value == 1) ? 'selected' : '';
- var selected_0 = (rdata[i].value == 0) ? 'selected' : '';
- ibody = ''
- break;
- case 1:
- var selected_1 = (rdata[i].value == 'On') ? 'selected' : '';
- var selected_0 = (rdata[i].value == 'Off') ? 'selected' : '';
- ibody = ''
- break;
- }
- mlist += '' + rdata[i].name + '' + ibody + ', ' + rdata[i].ps + '
'
- }
- var con = '' + mlist + '\
-
\
-
\
-
'
- $(".soft-man-con").html(con);
- });
-}
-
-//提交配置
-function submitConf(version) {
- var data = {
- version: version,
- bind: $("input[name='bind']").val(),
- 'port': $("input[name='port']").val(),
- 'timeout': $("input[name='timeout']").val(),
- maxclients: $("input[name='maxclients']").val(),
- databases: $("input[name='databases']").val(),
- requirepass: $("input[name='requirepass']").val(),
- maxmemory: $("input[name='maxmemory']").val(),
- };
-
- redisPost('submit_redis_conf', version, data, function(ret_data){
- var rdata = $.parseJSON(ret_data.data);
- layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
- });
-}
-
function zabbixReadme(){
var readme = '