Skip to content

Commit de929fb

Browse files
committed
Add firegento logo and configuration page, remove some useless widget because redundant
1 parent dec5ebf commit de929fb

File tree

8 files changed

+57
-117
lines changed

8 files changed

+57
-117
lines changed

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
11
MageMonitoring
22
==============
33

4-
Magento module to get health information of your Magento installation (Server, PHP, Cache, Logs, Rewrites, Modules version installed, ...)
4+
Magento module to get health information of your Magento installation (Server, PHP, Database, Cache, Logs, Rewrites, Modules version installed, ...)
55

66
### License OSL v3
77

8-
### News
9-
10-
- UI now fully configurable via frontend.
11-
- Merged with [Healthcheck](https://github.com/magento-hackathon/HealthCheck)
12-
138
### Features
149

1510
- Flexible yet simple plugin framework to execute checks or other tasks
1611
- Easily automate tasks with the provided WatchDog interface, includes aggregated reports for less spam. Get notified when your log files start moving!
1712
- Plugins can be added from other modules via config.xml declaration
1813
- UI fully configurable via frontend or config.xml
14+
- Merged with [Healthcheck](https://github.com/magento-hackathon/HealthCheck)
1915

2016
The default plugins currently provide the following information:
2117

2218
- OS / Server / Memory Information / Magento version vs available
19+
- Database Information
2320
- PHP version and some important configuration values vs recommended
2421
- Store configuration checks
25-
- Modules installed and their version number and status
22+
- Modules installed, their version number, their status and some recommended extensions
2623
- Product composition / types
2724
- Cache statistics with option to flush each cache or all at once (APC, APCU, Memcache, Redis, ZendOpcache)
2825
- Magento debug/exception log monitoring
2926
- Check for class and template file rewrites
27+
- SEO / Privacy / Security / Cron / Important files / Patches check
3028

3129
### Documentation
3230

@@ -36,7 +34,7 @@ The default plugins currently provide the following information:
3634

3735
### Usage
3836

39-
Log into the Magento backend and navigate to: System > Monitoring
37+
Log into the Magento backend and navigate to: System > Monitoring AND/OR System > Configuration > Advanced > Monitoring
4038

4139
Installation Instructions
4240
-------------------------
@@ -82,7 +80,7 @@ Uninstallation
8280
--------------
8381
* Remove all extension files from your Magento installation
8482
* Via modman: `modman remove Hackathon_MageMonitoring`
85-
* Via composer, remove the line of your composer.json related to `magento-hackathon/hackathon_magemonitoring`
83+
* Via composer, remove the line of your composer.json related to `magento-hackathon/hackathon_magemonitoring` and do `php composer.phar update`
8684

8785
### Core Contributors
8886

@@ -91,3 +89,5 @@ Uninstallation
9189
- [Erik Dannenberg](https://github.com/edannenberg)
9290
- [Yaroslav Rogoza](https://github.com/Gribnik)
9391
- [Nick Kravchuk](https://github.com/nickua)
92+
93+
### Special Thanks to [Shopwerf](shopwerft.com) for their contribution

app/code/community/Hackathon/MageMonitoring/Block/Adminhtml/System/Config/Form/Field/Info.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Hackathon_MageMonitoring_Block_Adminhtml_System_Config_Form_Field_Info
3131
implements Varien_Data_Form_Element_Renderer_Interface
3232
{
3333

34-
const URL = 'http://www.magemonitoring.com/';
34+
const URL = 'http://www.firegento.com/';
3535

3636
/**
3737
* Renders element
@@ -41,16 +41,15 @@ class Hackathon_MageMonitoring_Block_Adminhtml_System_Config_Form_Field_Info
4141
*/
4242
public function render(Varien_Data_Form_Element_Abstract $element)
4343
{
44-
$imagesPath = str_replace('_', '/', mb_strtolower($this->getModuleName()));
45-
$logoSrc = $this->getSkinUrl('images/' . $imagesPath . '/magemonitoring_logo.png');
44+
$logoSrc = $this->getSkinUrl('monitoring/images/firegento.jpg');
4645

4746
$html = '
4847
<tr id="row_%s">
4948
<td colspan="2">
5049
<div class="box">
5150
<p>
52-
<a href="' . self::URL . '" target="_blank" title="' . $this->__('Go to Shopwerft Website') . '">
53-
<img src="' . $logoSrc . '" alt="' . $this->__('Shopwerft') . '" />
51+
<a href="' . self::URL . '" target="_blank" title="' . $this->__('Go to Firegento Website') . '">
52+
<img src="' . $logoSrc . '" alt="' . $this->__('Firegento') . '" />
5453
</a>
5554
</p>
5655
<p>%s</p>
@@ -74,4 +73,3 @@ public function render(Varien_Data_Form_Element_Abstract $element)
7473
return sprintf($html, $element->getHtmlId(), $element->getComment(), $linksHtml);
7574
}
7675
}
77-

app/code/community/Hackathon/MageMonitoring/Model/Widget/Extensions/Community.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ class Hackathon_MageMonitoring_Model_Widget_Extensions_Community
4646
'German_LocalePackDe',
4747
'Hackathon_IndexerStats',
4848
'Hackathon_MageMonitoring',
49-
'Licentia_Ecms',
5049
'Netzarbeiter_NicerImageNames',
5150
'Treynolds_Qconfig',
5251
);

app/code/community/Hackathon/MageMonitoring/etc/adminhtml.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@
3939
<magemonitoring translate="label" module="magemonitoring">
4040
<title>Magento Monitoring</title>
4141
</magemonitoring>
42+
<system>
43+
<children>
44+
<config>
45+
<children>
46+
<magemonitoring translate="label" module="magemonitoring">
47+
<title>Magento Monitoring Configuration</title>
48+
</magemonitoring>
49+
</children>
50+
</config>
51+
</children>
52+
</system>
4253
</children>
4354
</admin>
4455
</resources>

app/code/community/Hackathon/MageMonitoring/etc/config.xml

Lines changed: 32 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<config>
2424
<modules>
2525
<Hackathon_MageMonitoring>
26-
<version>2.0.2</version>
26+
<version>2.1.0</version>
2727
<depends>
2828
<Mage_Adminhtml />
2929
</depends>
@@ -99,6 +99,14 @@
9999
<path>dev/log/active</path>
100100
<recommendation>1</recommendation>
101101
</dev_log_active>
102+
<system_log_enabled>
103+
<path>system/log/enabled</path>
104+
<recommendation>1</recommendation>
105+
</system_log_enabled>
106+
<system_log_clean_after_day>
107+
<path>system/log/clean_after_day</path>
108+
<recommendation>30</recommendation>
109+
</system_log_clean_after_day>
102110
<dev_js_merge_files>
103111
<path>dev/js/merge_files</path>
104112
<recommendation>1</recommendation>
@@ -188,6 +196,14 @@
188196
</versions>
189197
<display_prio>5</display_prio>
190198
</shop_status>
199+
<productcomposition>
200+
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_ProductComposition</impl>
201+
<display_prio>10</display_prio>
202+
</productcomposition>
203+
<shop_configuration>
204+
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_ShopConfiguration</impl>
205+
<display_prio>20</display_prio>
206+
</shop_configuration>
191207
<sitemap>
192208
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_Sitemap</impl>
193209
<versions>
@@ -202,22 +218,19 @@
202218
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_Producttypes</impl>
203219
<display_prio>40</display_prio>
204220
</producttypes>
205-
<productcomposition>
206-
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_ProductComposition</impl>
207-
<display_prio>10</display_prio>
208-
</productcomposition>
209221
<logfilesize>
210222
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_Logfilesize</impl>
211-
<display_prio>25</display_prio>
223+
<display_prio>50</display_prio>
212224
</logfilesize>
225+
<log>
226+
<impl>Hackathon_MageMonitoring_Model_Widget_Log</impl>
227+
<display_prio>60</display_prio>
228+
<collapsed>1</collapsed>
229+
</log>
213230
<mediasize>
214231
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_Mediasize</impl>
215-
<display_prio>50</display_prio>
232+
<display_prio>70</display_prio>
216233
</mediasize>
217-
<shop_configuration>
218-
<impl>Hackathon_MageMonitoring_Model_Widget_HealthCheck_ShopConfiguration</impl>
219-
<display_prio>10</display_prio>
220-
</shop_configuration>
221234
</widgets>
222235
</health_check>
223236
<system_overview>
@@ -304,10 +317,15 @@
304317
</widgets>
305318
</class_rewrites>
306319
<modules_installed>
307-
<label>Modules Installed</label>
308-
<title>Modules Installed</title>
320+
<label>Magento Modules</label>
321+
<title>Magento Modules</title>
309322
<display_prio>60</display_prio>
310323
<widgets>
324+
<default_extensions_community>
325+
<impl>Hackathon_MageMonitoring_Model_Widget_Extensions_Community</impl>
326+
<display_prio>5</display_prio>
327+
<collapsed>1</collapsed>
328+
</default_extensions_community>
311329
<modules_core>
312330
<impl>Hackathon_MageMonitoring_Model_Widget_System_Modules</impl>
313331
<title>Modules core</title>
@@ -330,6 +348,7 @@
330348
</modules_local>
331349
</widgets>
332350
</modules_installed>
351+
333352
<system_logs>
334353
<label>System Logs</label>
335354
<title>System Logs</title>
@@ -496,43 +515,6 @@
496515
</shop_configuration>
497516
</security>
498517

499-
<maintenance>
500-
<impl>Hackathon_MageMonitoring_Model_Widget_Maintenance</impl>
501-
<display_prio>30</display_prio>
502-
<collapsed>1</collapsed>
503-
<shop_configuration>
504-
<values>
505-
<dev_log_active>
506-
<title>Logging activated</title>
507-
<path>dev/log/active</path>
508-
<recommendation>1</recommendation>
509-
</dev_log_active>
510-
<system_log_enabled>
511-
<title>Log cleaning activated</title>
512-
<path>system/log/enabled</path>
513-
<recommendation>1</recommendation>
514-
</system_log_enabled>
515-
<system_log_clean_after_day>
516-
<title>Log cleaning interval</title>
517-
<path>system/log/clean_after_day</path>
518-
<recommendation>30</recommendation>
519-
</system_log_clean_after_day>
520-
</values>
521-
</shop_configuration>
522-
</maintenance>
523-
524-
<default_extensions_community>
525-
<impl>Hackathon_MageMonitoring_Model_Widget_Extensions_Community</impl>
526-
<display_prio>32</display_prio>
527-
<collapsed>1</collapsed>
528-
</default_extensions_community>
529-
530-
<log>
531-
<impl>Hackathon_MageMonitoring_Model_Widget_Log</impl>
532-
<display_prio>34</display_prio>
533-
<collapsed>1</collapsed>
534-
</log>
535-
536518
<hosting>
537519
<impl>Hackathon_MageMonitoring_Model_Widget_Hosting</impl>
538520
<display_prio>35</display_prio>
@@ -584,36 +566,6 @@
584566
<collapsed>1</collapsed>
585567
</rootfiles>
586568

587-
<performance>
588-
<impl>Hackathon_MageMonitoring_Model_Widget_Performance</impl>
589-
<display_prio>40</display_prio>
590-
<collapsed>1</collapsed>
591-
<shop_configuration>
592-
<values>
593-
<catalog_frontend_flat_catalog_category>
594-
<title>Flat Tables - Category</title>
595-
<path>catalog/frontend/flat_catalog_category</path>
596-
<recommendation>1</recommendation>
597-
</catalog_frontend_flat_catalog_category>
598-
<catalog_frontend_flat_catalog_product>
599-
<title>Flat Tables - Product</title>
600-
<path>catalog/frontend/flat_catalog_product</path>
601-
<recommendation>1</recommendation>
602-
</catalog_frontend_flat_catalog_product>
603-
<dev_js_merge_files>
604-
<title>Merge JS Files</title>
605-
<path>dev/js/merge_files</path>
606-
<recommendation>1</recommendation>
607-
</dev_js_merge_files>
608-
<dev_css_merge_css_files>
609-
<title>Merge CSS Files</title>
610-
<path>dev/css/merge_css_files</path>
611-
<recommendation>1</recommendation>
612-
</dev_css_merge_css_files>
613-
</values>
614-
</shop_configuration>
615-
</performance>
616-
617569
<patches>
618570
<impl>Hackathon_MageMonitoring_Model_Widget_Patches</impl>
619571
<display_prio>50</display_prio>

app/code/community/Hackathon/MageMonitoring/etc/system.xml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0"?>
22
<config>
3-
43
<sections>
54
<magemonitoring translate="label" module="magemonitoring">
65
<label>Monitoring</label>
76
<frontend_type>text</frontend_type>
8-
<tab>magemonitoring</tab>
7+
<tab>advanced</tab>
98
<sort_order>10</sort_order>
109
<show_in_default>1</show_in_default>
1110
<show_in_website>1</show_in_website>
@@ -21,25 +20,6 @@
2120
<fields>
2221
<info translate="label">
2322
<label>MageMonitoring</label>
24-
<!--<comment><![CDATA[Information text]]></comment>-->
25-
<!--<links>-->
26-
<!--<module>-->
27-
<!--<label>Information about this module</label>-->
28-
<!--<url>http://www.magemonitoring.com/magento-module/magento-module/MODULNAME.html</url>-->
29-
<!--</module>-->
30-
<!--<support>-->
31-
<!--<label>Module Support</label>-->
32-
<!--<url>http://www.magemonitoring.com/magento-module/contacts</url>-->
33-
<!--</support>-->
34-
<!--<guarantee>-->
35-
<!--<label>Shopwerft Guarantees</label>-->
36-
<!--<url>http://www.magemonitoring.com/magento-module/garantien.html</url>-->
37-
<!--</guarantee>-->
38-
<!--<more>-->
39-
<!--<label>More Premium Shopwerft Modules</label>-->
40-
<!--<url>http://www.magemonitoring.com/magento-module</url>-->
41-
<!--</more>-->
42-
<!--</links>-->
4323
<sort_order>1</sort_order>
4424
<frontend_model>magemonitoring/adminhtml_system_config_form_field_info</frontend_model>
4525
<show_in_default>1</show_in_default>

loop.sh

100644100755
File mode changed.
8.63 KB
Loading

0 commit comments

Comments
 (0)