Merge remote-tracking branch 'upstream/master' into fix-docker-conf

Author: gfieni

powerapi-cli/build.sbt

@@ -1,5 +1,9 @@
 name := "powerapi-cli"
 
+libraryDependencies ++= Seq(
+  "com.spotify" % "docker-client" % "8.11.1"
+)
+
 mappings in Universal ++= {
   val dir = baseDirectory.value.getParentFile
 

powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala

@@ -24,12 +24,15 @@ package org.powerapi.app
 
 import java.lang.management.ManagementFactory
 
+import com.spotify.docker.client.exceptions.{ContainerNotFoundException, DockerException}
+import com.spotify.docker.client.messages.ContainerInfo
+import com.spotify.docker.client.{DefaultDockerClient, DockerClient}
+
 import scala.concurrent.Await
 import scala.concurrent.duration.DurationInt
 import scala.sys
 import scala.sys.process.stringSeqToProcess
 import scala.util.matching.Regex
-
 import org.powerapi.core.power._
 import org.powerapi.core.target._
 import org.powerapi.module.cpu.dvfs.CpuDvfsModule
@@ -39,7 +42,7 @@ import org.powerapi.module.extpowermeter.g5komegawatt.G5kOmegaWattModule
 import org.powerapi.module.extpowermeter.powerspy.PowerSpyModule
 import org.powerapi.module.extpowermeter.rapl.RAPLModule
 import org.powerapi.module.libpfm.{LibpfmCoreModule, LibpfmCoreProcessModule, LibpfmHelper, LibpfmModule, LibpfmProcessModule}
-import org.powerapi.reporter.{InfluxDisplay, ConsoleDisplay, FileDisplay, JFreeChartDisplay}
+import org.powerapi.reporter.{ConsoleDisplay, FileDisplay, InfluxDisplay, JFreeChartDisplay}
 import org.powerapi.{PowerDisplay, PowerMeter, PowerMonitoring}
 
 /**
@@ -59,6 +62,8 @@ object PowerAPI extends App {
   @volatile var powerMeters = Seq[PowerMeter]()
   @volatile var monitors = Seq[PowerMonitoring]()
 
+  lazy val docker: DockerClient = new DefaultDockerClient("unix:///var/run/docker.sock")
+
   val shutdownHookThread = scala.sys.ShutdownHookThread {
     println("PowerAPI is shutting down ...")
     monitors.foreach(monitor => monitor.cancel())
@@ -94,7 +99,7 @@ object PowerAPI extends App {
         |usage: ./powerapi modules procfs-cpu-simple|sigar-cpu-simple|cpu-dvfs|libpfm|libpfm-process|libpfm-core|libpfm-core-process|powerspy|g5k-omegawatt|rapl|disk-simple (1, *) *--prefix [name]*
         |                          monitor (1, *)
         |                            --frequency $MILLISECONDS
-        |                            --self (0, 1) --pids [pid, ...] (0, *) --apps [app, ...] (0, *) --containers [id, ...] (0, *) | all (0, 1)
+        |                            --self (0, 1) --pids [pid, ...] (0, *) --apps [app, ...] (0, *) --containers [name or ID, ...] (0, *) | all (0, 1)
         |                            --agg max|min|mean|median|sum
         |                            --console (0, 1) --file $FILEPATH (0, *) --chart (0, 1) --influx $HOST $PORT $USER $PWD $DB $MEASUREMENT (0, *)
         |                  duration [s]
@@ -153,7 +158,22 @@ object PowerAPI extends App {
       ), tail)
     case "--containers" :: value :: tail if validate(containersR, value) =>
       cliMonitorsSubcommand(options, currentMonitor + ('targets ->
-        (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(container => Container(container)))
+        (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map {
+          container =>
+            try {
+              val targetInformation: ContainerInfo = docker.inspectContainer(container)
+              Container(targetInformation.id(), targetInformation.name())
+            }
+            catch {
+              case _: ContainerNotFoundException =>
+                println("Container '" + container + "' does not exist")
+                sys.exit(1)
+
+              case _: DockerException =>
+                println("The Docker socket is unavailable, please check if Docker daemon is running and its socket exists at the following path : '/var/run/docker.sock'")
+                sys.exit(1)
+            }
+        })
       ), tail)
     case "--all" :: tail =>
       cliMonitorsSubcommand(options, currentMonitor + ('targets ->

powerapi-core/src/main/scala/org/powerapi/core/target/Target.scala

@@ -60,7 +60,7 @@ case class Application(name: String) extends Target {
   * @author <a href="mailto:l.huertas.pro@gmail.com">Loïc Huertas</a>
   */
 case class Container(id: String, name: String = "unknown") extends Target {
-  override def toString: String = id
+  override def toString: String = name.substring(1)
 }
 
 /**

powerapi-core/src/main/scala/org/powerapi/module/cpu/simple/CpuSimpleModule.scala

@@ -34,7 +34,6 @@ class CpuSimpleModule(osHelper: OSHelper, tdp: Double, tdpFactor: Double) extend
 object ProcFSCpuSimpleModule extends CpuSimpleFormulaConfiguration {
   def apply(): CpuSimpleModule = {
     val linuxHelper = new LinuxHelper
-
     new CpuSimpleModule(linuxHelper, tdp, tdpFactor)
   }
 }
@@ -47,7 +46,6 @@ object SigarCpuSimpleModule extends CpuSimpleFormulaConfiguration with SigarHelp
 
   def apply(): CpuSimpleModule = {
     val sigarHelper = new SigarHelper(sigar)
-
     new CpuSimpleModule(sigarHelper, tdp, tdpFactor)
   }
 }