diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-04-27 18:51:15 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-04-27 18:56:11 -0500 |
| commit | 10eb57597eecdb42e931a5f817af58b508e2fff9 (patch) | |
| tree | 82428c7c080f21e69f3869a3195e7db4979d9123 /src/lib/Bcfg2/Server/Reports/reports | |
| parent | c00d0c1d1a57895451bb479bf11a33d59cdf8635 (diff) | |
| download | bcfg2-10eb57597eecdb42e931a5f817af58b508e2fff9.tar.gz bcfg2-10eb57597eecdb42e931a5f817af58b508e2fff9.tar.bz2 bcfg2-10eb57597eecdb42e931a5f817af58b508e2fff9.zip | |
DBStats: Add unpruned entry reporting (#659)
Path type='directory' entries previously had no 'reason' associated with
their 'dirty' state.
This change adds a database field for unpruned entries which are present
in a pruned directory and displays that list in the web reporting
interface.
There is also a change made to the POSIX client tool which forces it to
display the extra entry list when running in interactive mode without
debugging enabled.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Reports/reports')
3 files changed, 24 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Reports/reports/models.py b/src/lib/Bcfg2/Server/Reports/reports/models.py index d141846a2..0438ea133 100644 --- a/src/lib/Bcfg2/Server/Reports/reports/models.py +++ b/src/lib/Bcfg2/Server/Reports/reports/models.py @@ -277,6 +277,7 @@ class Reason(models.Model): current_diff = models.TextField(max_length=1280, blank=True) is_binary = models.BooleanField(default=False) is_sensitive = models.BooleanField(default=False) + unpruned = models.TextField(max_length=1280, blank=True) def _str_(self): return "Reason" diff --git a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html index cc99ef503..cadc178a7 100644 --- a/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load split %} {% load syntax_coloring %} @@ -91,6 +92,20 @@ div.entry_list h3 { </div> {% endif %} + <!-- display extra directory entries --> + {% if item.reason.unpruned %} + <div class='entry_list'> + <div class='entry_list_head'> + <h3>Extra entries found</h3> + </div> + <table class='entry_list' cellpadding='3'> + {% for unpruned_item in item.reason.unpruned|split %} + <tr><td>{{ unpruned_item }}</td></tr> + {% endfor %} + </table> + </div> + {% endif %} + <div class='entry_list'> <div class='entry_list_head'> diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/split.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/split.py new file mode 100644 index 000000000..a9b4f0371 --- /dev/null +++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/split.py @@ -0,0 +1,8 @@ +from django import template +register = template.Library() + + +@register.filter +def split(s): + """split by newlines""" + return s.split('\n') |