tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,073 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

159 Commits

Author SHA1 Message Date
enriquecd 4f3f2525e1 Merge branch 'develop' into 1242-Unificar-ayudas-de-alertas 
Conflicts:
	pandora_console/include/help/en/help_alert_config.php
	pandora_console/include/help/en/help_alert_macros.php
	pandora_console/include/help/es/help_alert_config.php
	pandora_console/include/help/es/help_alert_macros.php
 2017-11-30 11:47:47 +01:00
vgilc 66d15f3e4f Merge branch 'ent-1239-falta-texto-de-ayuda-definicion-de-modulos' into 'develop' 
Added autodisable mode help

See merge request artica/pandorafms!976
 2017-11-29 16:55:24 +01:00
vgilc f8695a2781 Merge branch 'ent-986-macros-para-comentarios-en-ipam-4113-vodat' into 'develop' 
Added _event_cfX_ to macros help

See merge request artica/pandorafms!920
 2017-11-29 16:47:09 +01:00
fermin831 34da44f9fb Added cron help 2017-11-23 17:00:59 +01:00
Arturo Gonzalez 3495bb5cbf Added help elements 2017-11-21 16:47:45 +01:00
enriquecd 264b91d71e Change alert macros help texts and translations - #1242 2017-10-26 12:44:25 +02:00
fermin831 e638113f28 Added autodisable mode help 2017-10-25 20:31:18 +02:00
fermin831 f9abfa043c Added _event_cfX_ to macros help 2017-10-13 11:59:37 +02:00
fermin831 274fc2e15f Modified help to include _server_ip_ and _server_name_ macros 2017-10-09 12:35:46 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
enriquecd 4f2e12dcf9 Add _id_module_ definition to help - #1072 2017-08-28 16:46:39 +02:00
daniel 45f33f9748 fixed errors in helps macros 2017-08-24 15:40:03 +02:00
daniel e97057a183 fixed minor error 2017-08-24 15:08:24 +02:00
daniel 94cb6ee060 documentation wux 2017-08-24 14:04:12 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
vgilc a5d3f916d7 Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop' 
1005 graficas de alerta con umbrales

See merge request !702
 2017-08-18 12:42:27 +02:00
Daniel Maya 2963f18ed3 Added text line in label help 2017-08-16 12:05:17 +02:00
daniel 14422413a3 add helps in pandora macromodulegraphth 2017-08-02 12:00:26 +02:00
Arturo Gonzalez 6f343ccd74 Added moduledata macro help text 2017-06-12 17:10:19 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02:00
vgilc a2f664f0c9 Merge branch 'ent-531-Macro-alert_unknown_instructions_' into 'develop' 
Added _alert_unkown_instructions_ macro

See merge request !279
 2017-05-17 17:10:46 +02:00
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
fermin831 36aa71df56 Added macro _agentos_ to help actions 2017-04-27 10:14:50 +02:00
fermin831 1d5afbb36a Added _alert_unkown_instructions_ macro 2017-03-17 11:23:28 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
daniel b7d44c4c62 add new macro in helps 2017-03-09 11:14:58 +01:00
fermin831 31ea5bf5ec Added Time lapse in #434 2017-03-02 16:37:28 +01:00
daniel a6fadecd47 add new macro in alerts 2017-02-02 16:11:46 +01:00
Junichi Satoh 009b026a82 Added description for _agentcustomfield_n_ 2017-01-06 11:22:43 +09:00
daniel 93341a60e1 visual graph for critical and warning threshold 2016-10-20 16:26:05 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
Daniel Maya c0ec08d23b Changed Server Help. Ticket #2932. 2016-06-28 15:41:40 +02:00
Sancho Lerena 32282fa8e7 Update help_alert_config.php 2016-06-25 10:39:33 +02:00
fermin831 8eb41da69c Added help to SNMP alert position 2015-11-04 18:40:22 +01:00
m-lopez-f 5b78afc360 Translate to spanish from commit Added a new alert and plugin macro, _id_group_. by jsatoh 
(cherry picked from commit e4361bd860)
 2015-11-04 14:53:38 +01:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
Ramon Novoa f16ba3e1da Updated the alert-matches help files with documentation from the Wiki. 2015-05-04 10:55:59 +02:00
Ramon Novoa 484a5c1c2c Added missing help files. 2015-04-28 14:59:57 +02:00
Alejandro Gallardo Escobar 7d7b6ef02f Updated the help info 2015-04-10 19:16:06 +02:00
Alejandro Gallardo Escobar 57e8032b20 Added info about the new visual console and networkmap bits 2015-04-08 20:07:16 +02:00
Alejandro Gallardo Escobar 658bb921e7 Improved the help 2015-02-10 19:06:19 +01:00
Alejandro Gallardo Escobar a3783f70e1 Now the alert action command fields can have a HTML wysiwyg editor 2015-02-04 16:52:28 +01:00
mdtrooper 2d3f239789 Changes imprecise names and concepts in SNMP. Ticket: #1688 2015-01-21 14:47:54 +01:00
mdtrooper 9473270d44 Updated the list of module macros in the helps 2014-10-21 14:38:17 +02:00
hkosaka 4b2901670f Added the alert macros _groupcustomid_. 2014-10-02 17:15:38 +09:00
Sancho Lerena 524c5b1cd6 Modified help files to include a few real examples of postprocess values. 2014-09-22 16:08:29 +02:00
Alejandro Gallardo Escobar eeb9725334 Merge branch 'feature/ticket#1243-PlannedDowntime' into develop 2014-09-22 11:48:22 +02:00
Alejandro Gallardo Escobar 505f97b325 Added new help files to explain the datetime configuration of a planned downtime 2014-09-19 17:27:29 +02:00
mdtrooper 74bd7c3bd1 Added text into the ipam help about the unassigned addresses 2014-09-09 17:13:07 +02:00