From 65603a594359c8fcc26bc29b7a2c3d0e04ae515d Mon Sep 17 00:00:00 2001 From: netkiller Date: Thu, 19 Jan 2017 15:54:32 +0800 Subject: [PATCH] fixed nginx --- Dependency/README.md | 18 + Oracle/.project | 2 +- Oracle/README.md | 33 + Oracle/jdbc.properties | 3 + Oracle/pom.xml | 33 +- .../main/java/cn/netkiller/zabbix/Oracle.java | 7 +- redis/userparameter_redis.conf | 3 +- redis/zbx_export_templates.1.0.xml | 945 ++++++++++++++ redis/zbx_export_templates.xml | 1152 +++++++++-------- 9 files changed, 1624 insertions(+), 572 deletions(-) create mode 100644 Oracle/README.md create mode 100644 Oracle/jdbc.properties create mode 100644 redis/zbx_export_templates.1.0.xml diff --git a/Dependency/README.md b/Dependency/README.md index 5221cde..fc21727 100644 --- a/Dependency/README.md +++ b/Dependency/README.md @@ -1,6 +1,9 @@ Service Dependency Check ===== + # mkdir -p /srv/zabbix/libexec + # wget https://raw.githubusercontent.com/oscm/zabbix/master/Dependency/dependency /srv/zabbix/libexec/ + chmod +x /srv/zabbix/libexec/dependency [root@netkiller zabbix_agentd.d]# /srv/zabbix/libexec/dependency -h @@ -12,3 +15,18 @@ Service Dependency Check -h/--help zabbix_get -s 10.24.15.18 -k 'dependency.discovery' + + +Zabbix Agent +----- + # wget https://raw.githubusercontent.com/oscm/zabbix/master/Dependency/userparameter_dependency.conf -P /etc/zabbix/zabbix_agentd.d/ + # systemctl restart zabbix-agent + + +Config +----- + + mkdir -p /srv/zabbix/conf + cat >> /srv/zabbix/conf/dependency.conf << EOF + Redis 127.0.0.1 80 + EOF diff --git a/Oracle/.project b/Oracle/.project index 3f8f873..90fdcf4 100644 --- a/Oracle/.project +++ b/Oracle/.project @@ -1,6 +1,6 @@ - zabbix + oracle diff --git a/Oracle/README.md b/Oracle/README.md new file mode 100644 index 0000000..5a44417 --- /dev/null +++ b/Oracle/README.md @@ -0,0 +1,33 @@ +# Netkiller Oracle templates + +## Create monitor user + +CREATE USER ZABBIX +IDENTIFIED BY +DEFAULT TABLESPACE USERS +TEMPORARY TABLESPACE TEMP +PROFILE DEFAULT +ACCOUNT UNLOCK; +GRANT ALTER SESSION TO ZABBIX; +GRANT CREATE SESSION TO ZABBIX; +GRANT CONNECT TO ZABBIX; +ALTER USER ZABBIX DEFAULT ROLE ALL; +GRANT SELECT ON V_$INSTANCE TO ZABBIX; +GRANT SELECT ON DBA_USERS TO ZABBIX; +GRANT SELECT ON V_$LOG_HISTORY TO ZABBIX; +GRANT SELECT ON V_$PARAMETER TO ZABBIX; +GRANT SELECT ON SYS.DBA_AUDIT_SESSION TO ZABBIX; +GRANT SELECT ON V_$LOCK TO ZABBIX; +GRANT SELECT ON DBA_REGISTRY TO ZABBIX; +GRANT SELECT ON V_$LIBRARYCACHE TO ZABBIX; +GRANT SELECT ON V_$SYSSTAT TO ZABBIX; +GRANT SELECT ON V_$PARAMETER TO ZABBIX; +GRANT SELECT ON V_$LATCH TO ZABBIX; +GRANT SELECT ON V_$PGASTAT TO ZABBIX; +GRANT SELECT ON V_$SGASTAT TO ZABBIX; +GRANT SELECT ON V_$LIBRARYCACHE TO ZABBIX; +GRANT SELECT ON V_$PROCESS TO ZABBIX; +GRANT SELECT ON DBA_DATA_FILES TO ZABBIX; +GRANT SELECT ON DBA_TEMP_FILES TO ZABBIX; +GRANT SELECT ON DBA_FREE_SPACE TO ZABBIX; +GRANT SELECT ON V_$SYSTEM_EVENT TO ZABBIX; diff --git a/Oracle/jdbc.properties b/Oracle/jdbc.properties new file mode 100644 index 0000000..51b4167 --- /dev/null +++ b/Oracle/jdbc.properties @@ -0,0 +1,3 @@ +jdbc.url=jdbc\:oracle\:thin\:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=202.126.39.133)(PORT=28022))(LOAD_BALANCE=yes)(FAILOVER=ON)(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=proda07)(FAILOVER_MODE=(TYPE=SESSION)(METHOD=BASIC)))) +jdbc.username=b01 +jdbc.password=jI0CfJly7y5YB06 \ No newline at end of file diff --git a/Oracle/pom.xml b/Oracle/pom.xml index 9f7913f..143c701 100644 --- a/Oracle/pom.xml +++ b/Oracle/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.netkiller - zabbix + oracle 0.0.1-SNAPSHOT jar @@ -82,22 +82,23 @@ - true + true lib/ cn.netkiller.zabbix.Oracle - + + org.apache.maven.plugins maven-dependency-plugin 2.10 - ${project.build.directory}/lib - false - false - + ${project.build.directory}/lib + false + false + copy-dependencies @@ -111,6 +112,24 @@ + + + + + maven-assembly-plugin + + + + cn.netkiller.zabbix.Oracle + + + + jar-with-dependencies + + + + + diff --git a/Oracle/src/main/java/cn/netkiller/zabbix/Oracle.java b/Oracle/src/main/java/cn/netkiller/zabbix/Oracle.java index 77cd37d..cd80bde 100644 --- a/Oracle/src/main/java/cn/netkiller/zabbix/Oracle.java +++ b/Oracle/src/main/java/cn/netkiller/zabbix/Oracle.java @@ -1,6 +1,8 @@ package cn.netkiller.zabbix; import java.sql.DriverManager; +import java.net.ProxySelector; + import java.sql.ResultSet; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -32,6 +34,7 @@ public class Oracle { private Connection connection = null;// 创建一个数据库连接 public Oracle() { + ProxySelector.setDefault(null); try { this.logger.setLevel(Level.INFO); @@ -204,15 +207,13 @@ public class Oracle { oracle.openConfig(System.getProperty("config")); } - - if (args[0].equals("--query")) { System.out.println(oracle.test()); } if (args[0].equals("--user")) { for (String username : oracle.user()) { System.out.println(username); - } + } } if (args[0].equals("--session")) { Map session = null; diff --git a/redis/userparameter_redis.conf b/redis/userparameter_redis.conf index 19377ab..4dbcc44 100644 --- a/redis/userparameter_redis.conf +++ b/redis/userparameter_redis.conf @@ -8,5 +8,6 @@ # Discovery # Return Redis statistics -UserParameter=redis.status[*],redis-cli -h 127.0.0.1 -p 6379 info|grep $1|cut -d : -f2 +UserParameter=redis.local[*],redis-cli -h 127.0.0.1 -p 6379 info|grep $1|cut -d : -f2 +UserParameter=redis.status[*],redis-cli -h $1 -p $2 info|grep $3|cut -d : -f2 UserParameter=redis.proc,pidof redis-server | wc -l \ No newline at end of file diff --git a/redis/zbx_export_templates.1.0.xml b/redis/zbx_export_templates.1.0.xml new file mode 100644 index 0000000..ad209d6 --- /dev/null +++ b/redis/zbx_export_templates.1.0.xml @@ -0,0 +1,945 @@ + + + 3.2 + 2016-11-23T09:00:00Z + + + Templates + + + + + + + + + + {Template App Redis:net.tcp.listen[6379].count(#3,0,"eq")}=3 + Redis port 6379 is not running + + 0 + 4 + + 0 + + 0 + + 0 + + 0 + + + + + {Template App Redis:nginx.proc.last()}=0 + redis was down! + + 0 + 4 + Redis process count: 0 + 0 + + 0 + + 0 + + 0 + + + + + + + + Redis key + 900 + 200 + 0.0000 + 100.0000 + 1 + 1 + 0 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + C80000 + 0 + 2 + 0 + + Template App Redis + redis.status[evicted_keys] + + + + 1 + 0 + 00C800 + 0 + 2 + 0 + + Template App Redis + redis.status[expired_keys] + + + + + + + Redis Last save time + 900 + 200 + 0.0000 + 100.0000 + 1 + 1 + 0 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + C80000 + 0 + 2 + 0 + + Template App Redis + redis.status[last_save_time] + + + + + + Redis Port Connections + 900 + 200 + 0.0000 + 100.0000 + 1 + 0 + 0 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + EE0000 + 0 + 4 + 0 + + Template App Redis + redis.status[blocked_clients] + + + + 1 + 0 + BBBB00 + 0 + 4 + 0 + + Template App Redis + redis.status[total_connections_received] + + + + 2 + 0 + CC00CC + 0 + 4 + 0 + + Template App Redis + redis.status[total_commands_processed] + + + + 3 + 0 + 00CCCC + 0 + 4 + 0 + + Template App Redis + redis.status[connected_slave] + + + + 4 + 0 + 009900 + 0 + 4 + 0 + + Template App Redis + redis.status[connected_clients] + + + + + + Redis Port status + 900 + 200 + 0.0000 + 100.0000 + 1 + 1 + 0 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + C80000 + 0 + 2 + 0 + + Template App Redis + net.tcp.listen[6379] + + + + + + Redis Uptime_in_seconds + 900 + 200 + 0.0000 + 100.0000 + 1 + 1 + 0 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + C80000 + 0 + 2 + 0 + + Template App Redis + redis.status[uptime_in_seconds] + + + + + + Redis Used memory + 900 + 200 + 0.0000 + 100.0000 + 1 + 1 + 0 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + C80000 + 0 + 2 + 0 + + Template App Redis + redis.status[used_memory:] + + + + 1 + 0 + 00C8C8 + 0 + 2 + 0 + + Template App Redis + redis.status[used_memory_rss] + + + + + + \ No newline at end of file diff --git a/redis/zbx_export_templates.xml b/redis/zbx_export_templates.xml index ad209d6..98eda7d 100644 --- a/redis/zbx_export_templates.xml +++ b/redis/zbx_export_templates.xml @@ -1,329 +1,43 @@ 3.2 - 2016-11-23T09:00:00Z + 2016-12-27T02:16:04Z + + Netkiller + Templates + + Testing + - - {Template App Redis:net.tcp.listen[6379].count(#3,0,"eq")}=3 + 0 + Redis port 6379 is not running + 0 + 0 4 0 + 0 - 0 - - 0 - - 0 - + - - - {Template App Redis:nginx.proc.last()}=0 + + {Template App Redis:redis.proc.last()}=0 + 0 + redis was down! + 0 + 0 4 Redis process count: 0 0 + 0 - 0 - - 0 - - 0 - + - - Redis key 900 @@ -703,7 +721,7 @@ 0 Template App Redis - redis.status[evicted_keys] + redis.status[{$HOST},{$PORT},evicted_keys] @@ -715,14 +733,13 @@ 0 Template App Redis - redis.status[expired_keys] + redis.status[{$HOST},{$PORT},expired_keys] - - Redis Last save time + Redis Last_save_time 900 200 0.0000 @@ -748,7 +765,7 @@ 0 Template App Redis - redis.status[last_save_time] + redis.status[{$HOST},{$PORT},last_save_time] @@ -780,7 +797,7 @@ 0 Template App Redis - redis.status[blocked_clients] + redis.status[{$HOST},{$PORT},blocked_clients] @@ -792,7 +809,7 @@ 0 Template App Redis - redis.status[total_connections_received] + redis.status[{$HOST},{$PORT},total_connections_received] @@ -804,7 +821,7 @@ 0 Template App Redis - redis.status[total_commands_processed] + redis.status[{$HOST},{$PORT},total_commands_processed] @@ -816,7 +833,7 @@ 0 Template App Redis - redis.status[connected_slave] + redis.status[{$HOST},{$PORT},connected_slave] @@ -828,7 +845,7 @@ 0 Template App Redis - redis.status[connected_clients] + redis.status[{$HOST},{$PORT},connected_clients] @@ -892,7 +909,7 @@ 0 Template App Redis - redis.status[uptime_in_seconds] + redis.status[{$HOST},{$PORT},uptime_in_seconds] @@ -924,7 +941,7 @@ 0 Template App Redis - redis.status[used_memory:] + redis.status[{$HOST},{$PORT},used_memory:] @@ -936,10 +953,25 @@ 0 Template App Redis - redis.status[used_memory_rss] + redis.status[{$HOST},{$PORT},used_memory_rss] - \ No newline at end of file + + + Service state + + + 0 + Down + + + 1 + Up + + + + +