[IM] No longer need the warning as we combined past data

inex · Aug 21, 2014 · 46d1eda · 46d1eda
1 parent 71bac77
commit 46d1eda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/application/controllers/CliController.php b/application/controllers/CliController.php
@@ -293,7 +293,7 @@ public function cliExportGroupAction()
  * This CLI action just lists the files to merge to and from.
  *
  * Use a merger such as: http://bangbangsoundslikemachinery.blogspot.ie/2012/02/mrtg-log-aggregator.html
- * And set $MERGER and $PATH accordingly before running the resultant commands.
+ * And set $MERGER and $MRTGPATH accordingly before running the resultant commands.
  */
  public function cliLagHistoryToFromAction()
  {
@@ -313,11 +313,11 @@ public function cliLagHistoryToFromAction()
  echo '$MERGER';
  foreach( $vi->getPhysicalInterfaces() as $pi )
  {
- echo ' $PATH/' . IXP_Mrtg::getMrtgFilePath( 'members', 'LOG', $pi->getMonitorIndex(), $category, $c->getShortname() );
+ echo ' $MRTGPATH/' . IXP_Mrtg::getMrtgFilePath( 'members', 'LOG', $pi->getMonitorIndex(), $category, $c->getShortname() );
  }
 
  echo ' >';
- echo IXP_Mrtg::getMrtgFilePath( 'members', 'LOG', 'lag-viid-' . $vi->getId(), $category, $c->getShortname() );
+ echo ' $MRTGPATH/' . IXP_Mrtg::getMrtgFilePath( 'members', 'LOG', 'lag-viid-' . $vi->getId(), $category, $c->getShortname() );
  echo "\n";
  }
  }

diff --git a/application/views/statistics/member-drilldown.phtml b/application/views/statistics/member-drilldown.phtml
@@ -37,16 +37,6 @@
 
 {OSS_Message}
 
-{if $isLAG}
-
-<div class="alert alert-info">
- <button type="button" class="close" data-dismiss="alert">&times;</button>
- <strong>Note!</strong> LAG aggregate graphs were only put live on 2014-08-21. Traffic information prior to this date
- can be found via the individual port graphs of the LAG.
-</div>
-
-{/if}
-
 <div class="row-fluid">
 
  <div class="span6">