@@ -4,18 +4,18 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | class TrapModuleConfig |
| 6 | 6 | { |
| 7 | - /********** Database configuration ***********************/ |
|
| 7 | + /********** Database configuration ***********************/ |
|
| 8 | 8 | // Database prefix for tables |
| 9 | - protected $table_prefix; //< Database prefix for tables |
|
| 9 | + protected $table_prefix; //< Database prefix for tables |
|
| 10 | 10 | protected $DBConfigDefaults=array( |
| 11 | 11 | 'db_remove_days' => 60, // number of days before removing traps |
| 12 | 12 | 'log_destination' => 'syslog', // Log destination for trap handler |
| 13 | 13 | 'log_file' => '/tmp/trapdirector.log', // Log file |
| 14 | 14 | 'log_level' => 2, // log level |
| 15 | 15 | 'use_SnmpTrapAddess' => 1, // use SnmpTrapAddress by default |
| 16 | - 'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID |
|
| 17 | - 'max_rows_in_list' => 25, // Max rows displayed in table before paging |
|
| 18 | - 'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> .... |
|
| 16 | + 'SnmpTrapAddess_oid' => '.1.3.6.1.6.3.18.1.3', // default snmpTrapAdress OID |
|
| 17 | + 'max_rows_in_list' => 25, // Max rows displayed in table before paging |
|
| 18 | + 'handler_categories' => '0:Not categorized' // handlers categories : <index>:<name>!<index>:<name> .... |
|
| 19 | 19 | ); |
| 20 | 20 | // get default values for dbconfig |
| 21 | 21 | public function getDBConfigDefaults() { return $this->DBConfigDefaults;} |
@@ -122,27 +122,27 @@ discard block |
||
| 122 | 122 | // Note : must have 'source_ip' and 'last_sent' |
| 123 | 123 | public function getTrapHostListDisplayColumns() |
| 124 | 124 | { |
| 125 | - return array( |
|
| 126 | - 'source_name' => 't.source_name', |
|
| 127 | - 'source_ip' => 't.source_ip', |
|
| 128 | - 'trap_oid' => 't.trap_oid', |
|
| 129 | - 'count' => 'count(*)', |
|
| 130 | - 'last_sent' => 'UNIX_TIMESTAMP(max(t.date_received))' |
|
| 131 | - ); |
|
| 125 | + return array( |
|
| 126 | + 'source_name' => 't.source_name', |
|
| 127 | + 'source_ip' => 't.source_ip', |
|
| 128 | + 'trap_oid' => 't.trap_oid', |
|
| 129 | + 'count' => 'count(*)', |
|
| 130 | + 'last_sent' => 'UNIX_TIMESTAMP(max(t.date_received))' |
|
| 131 | + ); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | public function getTrapHostListSearchColumns() |
| 135 | 135 | { |
| 136 | - return array(); // No search needed on this table |
|
| 136 | + return array(); // No search needed on this table |
|
| 137 | 137 | } |
| 138 | 138 | // Titles display in Trap List table |
| 139 | 139 | public function getTrapHostListTitles() |
| 140 | 140 | { |
| 141 | - return array( |
|
| 142 | - 'trap_oid' => 'Trap OID', |
|
| 143 | - 'count' => 'Number of traps received', |
|
| 144 | - 'last_sent' => 'Last trap received' |
|
| 145 | - ); |
|
| 141 | + return array( |
|
| 142 | + 'trap_oid' => 'Trap OID', |
|
| 143 | + 'count' => 'Number of traps received', |
|
| 144 | + 'last_sent' => 'Last trap received' |
|
| 145 | + ); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | |
@@ -157,13 +157,13 @@ discard block |
||
| 157 | 157 | 'source_ip' => "CASE WHEN r.ip4 IS NULL THEN r.ip6 ELSE r.ip4 END", |
| 158 | 158 | 'trap_oid' => 'r.trap_oid', |
| 159 | 159 | 'rule' => 'r.rule', |
| 160 | - 'comment' => 'r.comment', |
|
| 161 | - 'category' => 'r.rule_type', |
|
| 160 | + 'comment' => 'r.comment', |
|
| 161 | + 'category' => 'r.rule_type', |
|
| 162 | 162 | 'action_match' => 'r.action_match', |
| 163 | 163 | 'action_nomatch'=> 'r.action_nomatch', |
| 164 | 164 | 'service_name' => 'r.service_name', |
| 165 | 165 | 'num_match' => 'r.num_match', |
| 166 | - 'rule_type' => 'r.rule_type', |
|
| 166 | + 'rule_type' => 'r.rule_type', |
|
| 167 | 167 | 'id' => 'r.id' |
| 168 | 168 | ); |
| 169 | 169 | } |
@@ -184,17 +184,17 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | public function getHandlerColumns() |
| 186 | 186 | { |
| 187 | - return array( |
|
| 188 | - 'r.host_name', 'r.host_group_name', |
|
| 189 | - 'r.ip4', 'r.ip6', |
|
| 190 | - 'r.trap_oid', |
|
| 191 | - 'r.rule', |
|
| 192 | - 'r.action_match', |
|
| 193 | - 'r.action_nomatch', |
|
| 194 | - 'r.service_name', |
|
| 195 | - 'r.num_match', |
|
| 196 | - 'r.id' |
|
| 197 | - ); |
|
| 187 | + return array( |
|
| 188 | + 'r.host_name', 'r.host_group_name', |
|
| 189 | + 'r.ip4', 'r.ip6', |
|
| 190 | + 'r.trap_oid', |
|
| 191 | + 'r.rule', |
|
| 192 | + 'r.action_match', |
|
| 193 | + 'r.action_nomatch', |
|
| 194 | + 'r.service_name', |
|
| 195 | + 'r.num_match', |
|
| 196 | + 'r.id' |
|
| 197 | + ); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | // handler update (<key> => <sql select>) |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | 'revert_ok' => 'r.revert_ok', |
| 215 | 215 | 'display' => 'r.display', |
| 216 | 216 | 'modified' => 'UNIX_TIMESTAMP(r.modified)', |
| 217 | - 'modifier' => 'r.modifier', |
|
| 218 | - 'comment' => 'r.comment', |
|
| 219 | - 'category' => 'r.rule_type' |
|
| 217 | + 'modifier' => 'r.modifier', |
|
| 218 | + 'comment' => 'r.comment', |
|
| 219 | + 'category' => 'r.rule_type' |
|
| 220 | 220 | ); |
| 221 | 221 | } |
| 222 | 222 | |