Revert "Merge pull request #7 from tiny6996/master"

Dashboard doesn't load poperly.  Queries are empty.  Possible export issue.  Need to re-evaluate request

This reverts commit a367c8cb07ce08693ac5a1ba9ee64a175cb9c4a1, reversing
changes made to 312be1f6e8b0ba77c6ddfde243d67e892f18ac3c.
This commit is contained in:
Victor Robellini 2020-05-20 09:40:02 -04:00
parent a367c8cb07
commit e75eb5a3b2
3 changed files with 420 additions and 2276 deletions

View File

@ -94,7 +94,7 @@ After writing this up, I realize I need to change this variable name, it's just
### Telegraf ### Telegraf
[Telegraf Config](config/additional_config.conf) [Telegraf Config](config/additional_config.conf)
In the [/config](config/additional_config.conf) directory you will find all of the additional telegraf config. In pfSense, under Services -> Telegraf, at the bottom of the page with the teeny tiny text box is where you paste in the included config. In the [/config](config/additional_config.conf) directory you will find all of the additional telegraf config. In pfSense, under Services -> Teltegraf, at the bottom of the page with the teeny tiny text box is where you paste in the included config.
I also included the config for Unbound DNS and it's commented out. I'm not currently using it, but it's fully functional, just uncomment if you want to use it. I also included the config for Unbound DNS and it's commented out. I'm not currently using it, but it's fully functional, just uncomment if you want to use it.

View File

@ -6,21 +6,23 @@
] ]
data_format = "influx" data_format = "influx"
[[inputs.tail]] [[inputs.logparser]]
files = ["/var/log/pfblockerng/dnsbl.log"] files = ["/var/log/pfblockerng/dnsbl.log"]
name_suffix = "_dnsbl" from_beginning=true
data_format = "csv" [inputs.logparser.grok]
csv_delimiter = "," measurement = "dnsbl_log"
csv_tag_columns = ["destination","source","tld"] patterns = ["^%{WORD:BlockType}-%{WORD:BlockSubType},%{SYSLOGTIMESTAMP:timestamp:ts-syslog},%{IPORHOST:destination:tag},%{IPORHOST:source:tag},%{GREEDYDATA:call},%{WORD:BlockMethod},%{WORD:BlockList},%{IPORHOST:tld:tag},%{WORD:DefinedList:tag},%{GREEDYDATA:hitormiss}"]
csv_column_names = ["BlockType","timestamp","destination","source","call","BlockMethod","BlockList","tld","DefinedList","hitormiss"] timezone = "Local"
[inputs.logparser.tags]
value = "1"
[[inputs.tail]] [[inputs.logparser]]
files = ["/var/log/pfblockerng/ip_block.log"] files = ["/var/log/pfblockerng/ip_block.log"]
name_suffix = "_ipblock" from_beginning=true
data_format = "csv" [inputs.logparser.grok]
csv_delimiter = "," measurement = "ip_block_log"
csv_tag_columns = ["GeoIP","FeedName","SrcIP","DstIP"] patterns = ["^%{SYSLOGTIMESTAMP:timestamp:ts-syslog},%{NUMBER:TrackerID},%{GREEDYDATA:Interface},%{WORD:InterfaceName},%{WORD:action},%{NUMBER:IPVersion},%{NUMBER:ProtocolID},%{GREEDYDATA:Protocol},%{IPORHOST:SrcIP:tag},%{IPORHOST:DstIP:tag},%{NUMBER:SrcPort},%{NUMBER:DstPort},%{WORD:Dir},%{WORD:GeoIP:tag},%{GREEDYDATA:AliasName},%{GREEDYDATA:IPEvaluated},%{GREEDYDATA:FeedName:tag},%{HOSTNAME:ResolvedHostname},%{HOSTNAME:ClientHostname},%{GREEDYDATA:ASN},%{GREEDYDATA:DuplicateEventStatus}"]
csv_column_names = ["timestamp","TrackerID","Interface","InterfaceName","action","IPVersion","ProtocolID","Protocol","SrcIP","DstIP","SrcPort","DstPort","Dir","GeoIP","AliasName","IPEvaluated","FeedName","ResolvedHostname","ClientHostname","ASN","DuplicateEventStatus"] timezone = "Local"
#[[inputs.unbound]] #[[inputs.unbound]]
# server = "127.0.0.1:953" # server = "127.0.0.1:953"

File diff suppressed because it is too large Load Diff