CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

Harmonising logs messages + Changing some dygraph options

pull/13/head
Starow 2014-08-12 15:42:16 +02:00
parent c3948867ad
commit 6aa4d7cb7d
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ZMQ_PubSub_Categ.py
View File

@ -120,7 +120,7 @@ def main():
Pub.send_message(msg) Pub.send_message(msg)
#dico_categ.add(categ) #dico_categ.add(categ)
publisher.info('{0};{1};{2};{3};{4}'.format("Categ", PST.p_source, PST.p_date, PST.p_name,"Detected "+score+" "+word)) publisher.info('{0};{1};{2};{3};{4}'.format("Categ", PST.p_source, PST.p_date, PST.p_name,"Detected "+score+" "+"\""+word+"\""))
else: else:
if r_serv.sismember("SHUTDOWN_FLAGS", "Categ"): if r_serv.sismember("SHUTDOWN_FLAGS", "Categ"):

4
bin/ZMQ_Sub_CreditCards.py
View File

@ -69,9 +69,9 @@ def main():
pprint.pprint(Creditcard_set) pprint.pprint(Creditcard_set)
if (len(Creditcard_set) > 0): if (len(Creditcard_set) > 0):
publisher.warning('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name, str(len(Creditcard_set))+" Valid number(s)" )) publisher.critical('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name,"Checked " + str(len(Creditcard_set))+" valid number(s)" ))
else: else:
publisher.info('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name, "CreditCard Related" )) publisher.info('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name, "CreditCard related" ))
prec_filename = filename prec_filename = filename

1
bin/ZMQ_Sub_Duplicate.py
View File

@ -183,6 +183,7 @@ def main():
if dupl != []: if dupl != []:
PST.__setattr__("p_duplicate", dupl) PST.__setattr__("p_duplicate", dupl)
PST.save_attribute_redis(r_serv_merge, "p_duplicate", dupl) PST.save_attribute_redis(r_serv_merge, "p_duplicate", dupl)
publisher.info('{0};{1};{2};{3};{4}'.format("Duplicate", PST.p_source, PST.p_date, PST.p_name,"Detected " + str(len(dupl)))
y = time.time() y = time.time()

4
bin/ZMQ_Sub_Mails.py
View File

@ -63,9 +63,9 @@ def main():
pprint.pprint(MX_values) pprint.pprint(MX_values)
if MX_values[0] > 10: if MX_values[0] > 10:
publisher.warning('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name, str(MX_values[0])+ " e-mails detected" )) publisher.warning('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name,"Checked "+ str(MX_values[0])+ " e-mails" ))
else: else:
publisher.info('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name, str(MX_values[0])+ " e-mails detected" )) publisher.info('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name,"Checked " str(MX_values[0])+ " e-mail(s)" ))
prec_filename = filename prec_filename = filename
else: else:

2
bin/ZMQ_Sub_Onion.py
View File

@ -92,7 +92,7 @@ def main():
pprint.pprint(domains_list) pprint.pprint(domains_list)
print PST.p_path print PST.p_path
if len(domains_list) > 0: if len(domains_list) > 0:
publisher.warning('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name, str(len(domains_list))+" .onions detected" )) publisher.warning('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name,"Detected " + str(len(domains_list))+" .onion(s)" ))
else: else:
publisher.info('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name, "Onion related" )) publisher.info('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name, "Onion related" ))

2
bin/ZMQ_Sub_Urls.py
View File

@ -85,7 +85,7 @@ def main():
PST.save_attribute_redis(r_serv1, channel, (A_values[0],list(A_values[1]))) PST.save_attribute_redis(r_serv1, channel, (A_values[0],list(A_values[1])))
pprint.pprint(A_values) pprint.pprint(A_values)
publisher.info('{0};{1};{2};{3};{4}'.format("Url", PST.p_source, PST.p_date, PST.p_name, str(A_values[0])+" Valid url detected" )) publisher.info('{0};{1};{2};{3};{4}'.format("Url", PST.p_source, PST.p_date, PST.p_name, "Checked "+str(A_values[0])+" URL" ))
prec_filename = filename prec_filename = filename
else: else:

7
var/www/static/js/indexjavascript.js
View File

@ -153,11 +153,10 @@ $(document).ready(function () {
rollPeriod: 10, rollPeriod: 10,
labelsKMB: true, labelsKMB: true,
logscale: true, logscale: true,
drawGapEdgePoints: true, //drawGapEdgePoints: true,
legend: "always", //legend: "always",
connectSeparatedPoints: true, //connectSeparatedPoints: true,
fillGraph: true, fillGraph: true,
stackedGraph: true,
includeZero: true, includeZero: true,
}); });