Merge pull request #1033 from home-assistant/dev

Release 158

API.md

@@ -41,6 +41,7 @@ The addons from `addons` are only installed one.
     "arch": "armhf|aarch64|i386|amd64",
     "channel": "stable|beta|dev",
     "timezone": "TIMEZONE",
+    "logging": "debug|info|warning|error|critical",
     "ip_address": "ip address",
     "wait_boot": "int",
     "addons": [
@@ -79,6 +80,7 @@ Optional:
     "channel": "stable|beta|dev",
     "timezone": "TIMEZONE",
     "wait_boot": "int",
+    "logging": "debug|info|warning|error|critical",
     "addons_repositories": [
         "REPO_URL"
     ]
@@ -704,7 +706,8 @@ return:
     "machine": "type",
     "arch": "arch",
     "supported_arch": ["arch1", "arch2"],
-    "channel": "stable|beta|dev"
+    "channel": "stable|beta|dev",
+    "logging": "debug|info|warning|error|critical"
 }
 ```
 

hassio/api/info.py

@@ -1,9 +1,20 @@
 """Init file for Hass.io info RESTful API."""
 import logging
+from typing import Any, Dict
 
-from ..const import (ATTR_ARCH, ATTR_CHANNEL, ATTR_HASSOS, ATTR_HOMEASSISTANT,
-                     ATTR_HOSTNAME, ATTR_MACHINE, ATTR_SUPERVISOR,
-                     ATTR_SUPPORTED_ARCH)
+from aiohttp import web
+
+from ..const import (
+    ATTR_ARCH,
+    ATTR_CHANNEL,
+    ATTR_HASSOS,
+    ATTR_HOMEASSISTANT,
+    ATTR_HOSTNAME,
+    ATTR_LOGGING,
+    ATTR_MACHINE,
+    ATTR_SUPERVISOR,
+    ATTR_SUPPORTED_ARCH,
+)
 from ..coresys import CoreSysAttributes
 from .utils import api_process
 
@@ -14,7 +25,7 @@ class APIInfo(CoreSysAttributes):
     """Handle RESTful API for info functions."""
 
     @api_process
-    async def info(self, request):
+    async def info(self, request: web.Request) -> Dict[str, Any]:
         """Show system info."""
         return {
             ATTR_SUPERVISOR: self.sys_supervisor.version,
@@ -25,4 +36,5 @@ class APIInfo(CoreSysAttributes):
             ATTR_ARCH: self.sys_arch.default,
             ATTR_SUPPORTED_ARCH: self.sys_arch.supported,
             ATTR_CHANNEL: self.sys_updater.channel,
+            ATTR_LOGGING: self.sys_config.logging,
         }

hassio/api/panel/entrypoint.js

@@ -1 +1 @@
-!function(e){function n(n){for(var t,o,a=n[0],i=n[1],c=0,u=[];c<a.length;c++)o=a[c],r[o]&&u.push(r[o][0]),r[o]=0;for(t in i)Object.prototype.hasOwnProperty.call(i,t)&&(e[t]=i[t]);for(f&&f(n);u.length;)u.shift()()}var t={},r={4:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=a);var i,c=document.createElement("script");c.charset="utf-8",c.timeout=120,o.nc&&c.setAttribute("nonce",o.nc),c.src=function(e){return o.p+"chunk."+{0:"564a2f7b1c38ddaa4ce0",1:"659084fef4e3b7b66a76",2:"510634470d399e194ace",3:"f15d7f41c0d302cbbc7a",5:"5d31a1778f717ac8b063",6:"feb68d852b3f6d67d970",7:"3a63ad36bccf4ea567fa",8:"a571dfa106202cc57af6",9:"a7e5fb452cd1b3a5faef",10:"b3340b3df270d20af4a1",11:"6e9c87e51920a9c354e5",12:"352e12b12df29c09b455",13:"739b67c99ab56cdbd75d"}[e]+".js"}(e),i=function(n){c.onerror=c.onload=null,clearTimeout(f);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),a=n&&n.target&&n.target.src,i=new Error("Loading chunk "+e+" failed.\n("+o+": "+a+")");i.type=o,i.request=a,t[1](i)}r[e]=void 0}};var f=setTimeout(function(){i({type:"timeout",target:c})},12e4);c.onerror=c.onload=i,document.head.appendChild(c)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(o.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)o.d(t,r,function(n){return e[n]}.bind(null,r));return t},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],i=a.push.bind(a);a.push=n,a=a.slice();for(var c=0;c<a.length;c++)n(a[c]);var f=i;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(1),t.e(5)]).then(t.bind(null,2)),Promise.all([t.e(1),t.e(9),t.e(6)]).then(t.bind(null,1))});var r=document.createElement("style");r.innerHTML="\nbody {\n  font-family: Roboto, sans-serif;\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  height: 100vh;\n}\n",document.head.appendChild(r)}]);
+!function(e){function n(n){for(var t,o,a=n[0],i=n[1],c=0,u=[];c<a.length;c++)o=a[c],r[o]&&u.push(r[o][0]),r[o]=0;for(t in i)Object.prototype.hasOwnProperty.call(i,t)&&(e[t]=i[t]);for(f&&f(n);u.length;)u.shift()()}var t={},r={4:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=a);var i,c=document.createElement("script");c.charset="utf-8",c.timeout=120,o.nc&&c.setAttribute("nonce",o.nc),c.src=function(e){return o.p+"chunk."+{0:"564a2f7b1c38ddaa4ce0",1:"659084fef4e3b7b66a76",2:"510634470d399e194ace",3:"f15d7f41c0d302cbbc7a",5:"5d31a1778f717ac8b063",6:"0d97375a72c194aae1ac",7:"3a63ad36bccf4ea567fa",8:"a571dfa106202cc57af6",9:"a7e5fb452cd1b3a5faef",10:"b3340b3df270d20af4a1",11:"6e9c87e51920a9c354e5",12:"352e12b12df29c09b455",13:"739b67c99ab56cdbd75d"}[e]+".js"}(e),i=function(n){c.onerror=c.onload=null,clearTimeout(f);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),a=n&&n.target&&n.target.src,i=new Error("Loading chunk "+e+" failed.\n("+o+": "+a+")");i.type=o,i.request=a,t[1](i)}r[e]=void 0}};var f=setTimeout(function(){i({type:"timeout",target:c})},12e4);c.onerror=c.onload=i,document.head.appendChild(c)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(o.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)o.d(t,r,function(n){return e[n]}.bind(null,r));return t},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],i=a.push.bind(a);a.push=n,a=a.slice();for(var c=0;c<a.length;c++)n(a[c]);var f=i;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(1),t.e(5)]).then(t.bind(null,2)),Promise.all([t.e(1),t.e(9),t.e(6)]).then(t.bind(null,1))});var r=document.createElement("style");r.innerHTML="\nbody {\n  font-family: Roboto, sans-serif;\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  height: 100vh;\n}\n",document.head.appendChild(r)}]);

hassio/api/supervisor.py

@@ -17,7 +17,9 @@ from ..const import (
     ATTR_DESCRIPTON,
     ATTR_ICON,
     ATTR_INSTALLED,
+    ATTR_IP_ADDRESS,
     ATTR_LAST_VERSION,
+    ATTR_LOGGING,
     ATTR_LOGO,
     ATTR_MEMORY_LIMIT,
     ATTR_MEMORY_USAGE,
@@ -30,14 +32,13 @@ from ..const import (
     ATTR_TIMEZONE,
     ATTR_VERSION,
     ATTR_WAIT_BOOT,
-    ATTR_IP_ADDRESS,
     CONTENT_TYPE_BINARY,
     HASSIO_VERSION,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
 from ..utils.validate import validate_timezone
-from ..validate import CHANNELS, REPOSITORIES, WAIT_BOOT
+from ..validate import CHANNELS, LOG_LEVEL, REPOSITORIES, WAIT_BOOT
 from .utils import api_process, api_process_raw, api_validate
 
 _LOGGER = logging.getLogger(__name__)
@@ -48,6 +49,7 @@ SCHEMA_OPTIONS = vol.Schema(
         vol.Optional(ATTR_ADDONS_REPOSITORIES): REPOSITORIES,
         vol.Optional(ATTR_TIMEZONE): validate_timezone,
         vol.Optional(ATTR_WAIT_BOOT): WAIT_BOOT,
+        vol.Optional(ATTR_LOGGING): LOG_LEVEL,
     }
 )
 
@@ -90,6 +92,7 @@ class APISupervisor(CoreSysAttributes):
             ATTR_IP_ADDRESS: str(self.sys_supervisor.ip_address),
             ATTR_WAIT_BOOT: self.sys_config.wait_boot,
             ATTR_TIMEZONE: self.sys_config.timezone,
+            ATTR_LOGGING: self.sys_config.logging,
             ATTR_ADDONS: list_addons,
             ATTR_ADDONS_REPOSITORIES: self.sys_config.addons_repositories,
         }
@@ -108,6 +111,9 @@ class APISupervisor(CoreSysAttributes):
         if ATTR_WAIT_BOOT in body:
             self.sys_config.wait_boot = body[ATTR_WAIT_BOOT]
 
+        if ATTR_LOGGING in body:
+            self.sys_config.logging = body[ATTR_LOGGING]
+
         if ATTR_ADDONS_REPOSITORIES in body:
             new = set(body[ATTR_ADDONS_REPOSITORIES])
             await asyncio.shield(self.sys_addons.load_repositories(new))

hassio/config.py

@@ -8,15 +8,21 @@ from pathlib import Path, PurePath
 import pytz
 
 from .const import (
-    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
-    ATTR_LAST_BOOT, ATTR_WAIT_BOOT)
+    FILE_HASSIO_CONFIG,
+    HASSIO_DATA,
+    ATTR_TIMEZONE,
+    ATTR_ADDONS_CUSTOM_LIST,
+    ATTR_LAST_BOOT,
+    ATTR_WAIT_BOOT,
+    ATTR_LOGGING,
+)
 from .utils.dt import parse_datetime
 from .utils.json import JsonConfig
 from .validate import SCHEMA_HASSIO_CONFIG
 
 _LOGGER = logging.getLogger(__name__)
 
-HOMEASSISTANT_CONFIG = PurePath('homeassistant')
+HOMEASSISTANT_CONFIG = PurePath("homeassistant")
 
 HASSIO_SSL = PurePath("ssl")
 
@@ -45,7 +51,7 @@ class CoreConfig(JsonConfig):
     @property
     def timezone(self):
         """Return system timezone."""
-        config_file = Path(self.path_homeassistant, 'configuration.yaml')
+        config_file = Path(self.path_homeassistant, "configuration.yaml")
         try:
             assert config_file.exists()
             configuration = config_file.read_text()
@@ -53,7 +59,7 @@ class CoreConfig(JsonConfig):
             data = RE_TIMEZONE.search(configuration)
             assert data
 
-            timezone = data.group('timezone')
+            timezone = data.group("timezone")
             pytz.timezone(timezone)
         except (pytz.exceptions.UnknownTimeZoneError, OSError, AssertionError):
             _LOGGER.debug("Can't parse Home Assistant timezone")
@@ -67,15 +73,25 @@ class CoreConfig(JsonConfig):
         self._data[ATTR_TIMEZONE] = value
 
     @property
-    def wait_boot(self):
+    def wait_boot(self) -> int:
         """Return wait time for auto boot stages."""
         return self._data[ATTR_WAIT_BOOT]
 
     @wait_boot.setter
-    def wait_boot(self, value):
+    def wait_boot(self, value: int):
         """Set wait boot time."""
         self._data[ATTR_WAIT_BOOT] = value
 
+    @property
+    def logging(self) -> str:
+        """Return log level of system."""
+        return self._data[ATTR_LOGGING]
+
+    @logging.setter
+    def logging(self, value: str):
+        """Set system log level."""
+        self._data[ATTR_LOGGING] = value
+
     @property
     def last_boot(self):
         """Return last boot datetime."""
@@ -99,7 +115,7 @@ class CoreConfig(JsonConfig):
     @property
     def path_extern_hassio(self):
         """Return Hass.io data path external for Docker."""
-        return PurePath(os.environ['SUPERVISOR_SHARE'])
+        return PurePath(os.environ["SUPERVISOR_SHARE"])
 
     @property
     def path_extern_homeassistant(self):

hassio/const.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from ipaddress import ip_network
 
 
-HASSIO_VERSION = "157"
+HASSIO_VERSION = "158"
 
 URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
 URL_HASSIO_VERSION = "https://s3.amazonaws.com/hassio-version/{channel}.json"
@@ -67,6 +67,7 @@ ATTR_WAIT_BOOT = "wait_boot"
 ATTR_DEPLOYMENT = "deployment"
 ATTR_WATCHDOG = "watchdog"
 ATTR_CHANGELOG = "changelog"
+ATTR_LOGGING = "logging"
 ATTR_DATE = "date"
 ATTR_ARCH = "arch"
 ATTR_LONG_DESCRIPTION = "long_description"

hassio/validate.py

@@ -16,6 +16,7 @@ from .const import (
     ATTR_IMAGE,
     ATTR_LAST_BOOT,
     ATTR_LAST_VERSION,
+    ATTR_LOGGING,
     ATTR_PASSWORD,
     ATTR_PORT,
     ATTR_PORTS,
@@ -42,6 +43,7 @@ CHANNELS = vol.In([CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV])
 UUID_MATCH = vol.Match(r"^[0-9a-f]{32}$")
 SHA256 = vol.Match(r"^[0-9a-f]{64}$")
 TOKEN = vol.Match(r"^[0-9a-f]{32,256}$")
+LOG_LEVEL = vol.In(["debug", "info", "warning", "error", "critical"])
 
 
 def validate_repository(repository):
@@ -117,6 +119,7 @@ SCHEMA_HASSIO_CONFIG = vol.Schema(
             default=["https://github.com/hassio-addons/repository"],
         ): REPOSITORIES,
         vol.Optional(ATTR_WAIT_BOOT, default=5): WAIT_BOOT,
+        vol.Optional(ATTR_LOGGING, default="info"): LOG_LEVEL,
     },
     extra=vol.REMOVE_EXTRA,
 )

home-assistant-polymer

@@ -1 +1 @@
-Subproject commit 4d7bb0df7d5fd37737d83326e5c5cd4f0eccb5cf
+Subproject commit 5dbd5c7395b3a12d75df7d5b8df968a9af25e323