From: <jt...@hy...> - 2008-02-29 01:17:26
|
Author: jtravis Date: 2008-02-28 17:17:20 -0800 (Thu, 28 Feb 2008) New Revision: 7962 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7962 Modified: branches/HQ_3_2/ui_plugins/extra/sanedirect/app/SaneController.groovy Log: Add chart redirecting to sane controller Modified: branches/HQ_3_2/ui_plugins/extra/sanedirect/app/SaneController.groovy =================================================================== --- branches/HQ_3_2/ui_plugins/extra/sanedirect/app/SaneController.groovy 2008-02-29 01:16:49 UTC (rev 7961) +++ branches/HQ_3_2/ui_plugins/extra/sanedirect/app/SaneController.groovy 2008-02-29 01:17:20 UTC (rev 7962) @@ -14,6 +14,8 @@ def svc = params.getOne('service') def svcId = params.getOne('serviceId') def ctx = params.getOne('context') + def chart = params.getOne('chart') + def link = params.getOne('link') log.info "Redirecting from ${params}" @@ -41,9 +43,32 @@ findArgs['service'] = svc } - log.info "finding with ${findArgs}" def rsrc = resourceHelper.find(findArgs) + if (rsrc == null) { + log.warn "Resource specified by [${findArgs}] not found" + return "Resource specified by [${findArgs}] not found" + } args['resource'] = rsrc + + if (chart) { + def metric = rsrc.enabledMetrics.find { it.template.name == chart } + if (!metric) { + log.warn "No metric [${chart}] found for resource" + return "No metric [${chart}] found for resource" + } + args['resource'] = metric + def end = params.getOne('end', "${System.currentTimeMillis()}").toLong() + def start = params.getOne('start')?.toLong() + + if (start == null) + start = end - (8 * 60 * 60 * 1000) + + if (link?.toBoolean()) + args.resourceContext = null + else + args.resourceContext = [chart: true, start: start, end: end] + } + redirectTo(args) } } |