Sunburst,alarms,RCA & entity graph compute and alarm colors

Fixed the colors to sunburst according to operational_state
Fixed the colors to alarm_list according to operational_state
Fixed the colors to alarms in topology info according to operational_state
Fixed the colors to entity graph according to operational_state

Change-Id: Ie56640dc03282c404ddca6b55931f1a2990d4fcd
This commit is contained in:
Noam Bloom 2016-06-02 18:27:33 +03:00
parent 5267ffd43d
commit 735b58305c
12 changed files with 742 additions and 27 deletions

View File

@ -27,12 +27,12 @@
</thead>
<tbody>
<tr ng-repeat="alarm in alarmList.ialarms track by $index">
<td title="{$ alarm.normalized_severity $}"><i class="fa" ng-class="{'orange fa-exclamation-triangle': alarm.normalized_severity == 'SEVER' || alarm.normalized_severity == 'SEVERE', 'orange fa-exclamation-triangle': alarm.normalized_severity == 'WARNING', 'red fa-exclamation-circle': alarm.normalized_severity == 'CRITICAL', 'green fa-check': alarm.normalized_severity == 'DISABLED', 'gray fa-circle-o-notch': alarm.normalized_severity == 'UNKNOWN'}"></i></td>
<td title="{$ alarm.aggregated_severity $}"><i class="fa first-column" ng-class="{'orange fa-exclamation-triangle': alarm.operational_severity == 'SEVERE', 'yellow fa-exclamation-triangle': alarm.operational_severity == 'WARNING', 'red fa-exclamation-circle': alarm.operational_severity == 'CRITICAL', 'green fa-check': alarm.operational_severity == 'OK', 'gray fa-circle-o-notch': alarm.operational_severity == 'N/A'}"></i></td>
<td><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"yyyy-MM-dd hh:mm:ss"$} </td>
<td>{$alarm.name$}</td>
<td>{$alarm.resource_type$}</td>
<td>{$alarm.resource_id$}</td>
<td>{$alarm.normalized_severity | lowercase$}</td>
<td>{$alarm.aggregated_severity | lowercase$}</td>
<td>{$alarm.type$}</td>
<td ng-click="alarmList.onRcaClick(alarm)"><i class="fa fa-sitemap"></i></td>
</tr>

View File

@ -2,4 +2,8 @@
.refreshBtn{
text-align: right;
}
.first-column {
padding-left: 5px;
}
}

View File

@ -0,0 +1,193 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 33.9 33.9"
enable-background="new 0 0 33.9 33.9"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
width="100%"
height="100%"
sodipodi:docname="bell_gray_off.svg"><metadata
id="metadata4162"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs4160" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1025"
id="namedview4158"
showgrid="false"
inkscape:zoom="9.8452626"
inkscape:cx="54.944717"
inkscape:cy="5.997643"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><g
id="g4072"><g
id="g4074"><defs
id="defs4076"><path
id="SVGID_1_"
d="M17,0c9.4,0,17,7.6,17,17c0,9.4-7.6,17-17,17c-9.4,0-17-7.6-17-17C0,7.6,7.6,0,17,0L17,0z" /></defs><clipPath
id="SVGID_2_"><use
xlink:href="#SVGID_1_"
overflow="visible"
id="use4080" /></clipPath><g
clip-path="url(#SVGID_2_)"
id="g4082"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAFzAAABfgAAAZ//2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABgAAEBAAAAAAAAAAAAAAAAAAAABgEBAQEAAAAAAAAAAAAAAAAAAAUGEAEBAAAAAAAAAAAAAAAA AAAwQBEBAAAAAAAAAAAAAAAAAAAAQBIBAAAAAAAAAAAAAAAAAAAAMP/aAAwDAQACEQMRAAAApRkK IAAAAAAAH//aAAgBAgABBQAf/9oACAEDAAEFAB//2gAIAQEAAQUAp//aAAgBAgIGPwAf/9oACAED AgY/AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4084" /></g></g><g
id="g4086"><defs
id="defs4088"><path
id="SVGID_3_"
d="M13.1,25.2c0-0.1,0-0.3,0.1-0.5c-2,0-4.1,0-4.1,0c-0.8,0-1.4-0.7-1.4-1.6c0-0.5,0.2-0.9,0.5-1.3 c0.1-0.1,0.6-0.8,1.1-1.4c1-1.4,1.8-2.4,2.1-2.8c0,0,0.1-0.2,0.1-0.7c0-0.4,0-0.9-0.1-1.5l-0.1-1.6c0,0,0,0,0,0s0,0,0,0l0-0.2 c0-3,2.8-5.7,5.8-5.7h0.6c3,0,5.6,2.6,5.6,5.6l0,0.2c0,0,0,0,0,0l-0.1,1.6c0,0.6-0.1,1.1-0.1,1.5c0,0.5,0,0.7,0.1,0.7 c0.3,0.4,1.1,1.4,2.1,2.8c0.4,0.6,1,1.3,1.1,1.4c0.3,0.3,0.5,0.8,0.5,1.3c0,0.9-0.6,1.6-1.4,1.6c0,0-2.4,0-4.6,0 c0.1,0.2,0.1,0.3,0.1,0.5c0,2.3-1.5,3.9-3.8,3.9C14.7,29.1,13.1,27.5,13.1,25.2 M11.4,17.6C11.4,17.6,11.4,17.6,11.4,17.6 C11.4,17.6,11.4,17.6,11.4,17.6 M23.2,17.6C23.2,17.6,23.2,17.6,23.2,17.6C23.2,17.6,23.2,17.6,23.2,17.6" /></defs><clipPath
id="SVGID_4_"><use
xlink:href="#SVGID_3_"
overflow="visible"
id="use4092" /></clipPath><g
clip-path="url(#SVGID_4_)"
id="g4094"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAFwAAABewAAAZz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABfAAEBAAAAAAAAAAAAAAAAAAAABgEBAQAAAAAAAAAAAAAAAAAAAAIQAQEAAAAAAAAAAAAAAAAA ADBAEQEAAAAAAAAAAAAAAAAAAABAEgEAAAAAAAAAAAAAAAAAAAAw/9oADAMBAAIRAxEAAACVCgAA AAAAAP/aAAgBAgABBQAf/9oACAEDAAEFAB//2gAIAQEAAQUAp//aAAgBAgIGPwAf/9oACAEDAgY/ AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4096" /></g></g><g
id="g4098"><defs
id="defs4100"><path
id="SVGID_5_"
d="M25.4,23.7c-0.4,0-15.9,0-16.3,0c-0.4,0-0.6-0.7-0.2-1.2c0.4-0.4,2.7-3.7,3.2-4.2c0.5-0.5,0.3-2.1,0.2-4.5 c-0.1-2.5,2.3-4.8,4.8-4.8c0.2,0,0.4,0,0.6,0c2.5,0,4.7,2.3,4.6,4.8c-0.1,2.5-0.4,4,0.2,4.5c0.5,0.5,2.9,3.8,3.2,4.2 C26,23,25.9,23.7,25.4,23.7L25.4,23.7z M17,28.1c-1.6,0-3-0.9-3-2.9c0,0,1.4,0,1.4,0h3.1c0,0,1.3,0,1.3,0 C19.9,27.2,18.6,28.1,17,28.1L17,28.1z" /></defs><clipPath
id="SVGID_6_"><use
xlink:href="#SVGID_5_"
overflow="visible"
id="use4104" /></clipPath><g
clip-path="url(#SVGID_6_)"
id="g4106"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAFvAAABegAAAZv/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABeAAEBAAAAAAAAAAAAAAAAAAAABgEBAAAAAAAAAAAAAAAAAAAAABABAQAAAAAAAAAAAAAAAAAA MEARAQAAAAAAAAAAAAAAAAAAAEASAQAAAAAAAAAAAAAAAAAAADD/2gAMAwEAAhEDEQAAALwAAAAA AAAH/9oACAECAAEFAB//2gAIAQMAAQUAH//aAAgBAQABBQCn/9oACAECAgY/AB//2gAIAQMCBj8A H//aAAgBAQEGPwBP/9k="
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4108" /></g></g><g
display="none"
id="g4110"><defs
id="defs4112"><path
id="SVGID_7_"
d="M11.8,9.6C12,9.5,12,9.5,12,9.5c0.3-0.1,0.3-0.5,0.2-0.7l0,0c-0.2-0.3-0.6-0.4-0.9-0.2c0,0,0,0-0.3,0.2 c-1.3,1-2.2,2.5-2.2,4.3c0,1,0.3,2,0.9,2.8c0.2,0.2,0.2,0.2,0.2,0.2c0.2,0.2,0.6,0.3,0.9,0.1l0,0c0.3-0.2,0.3-0.5,0.1-0.7 c0,0,0,0-0.2-0.2C10.3,14.6,10,13.8,10,13C10,11.6,10.7,10.4,11.8,9.6L11.8,9.6z" /></defs><clipPath
id="SVGID_8_"
display="inline"><use
xlink:href="#SVGID_7_"
overflow="visible"
id="use4116" /></clipPath><g
display="inline"
clip-path="url(#SVGID_8_)"
id="g4118"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAF3AAABggAAAaP/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABgAAEBAQAAAAAAAAAAAAAAAAAABQYBAQEAAAAAAAAAAAAAAAAAAAABEAEBAAAAAAAAAAAAAAAA AAAwQBEBAAAAAAAAAAAAAAAAAAAAQBIBAAAAAAAAAAAAAAAAAAAAMP/aAAwDAQACEQMRAAAAyYsS 6kuUColipLAAAAD/2gAIAQIAAQUAH//aAAgBAwABBQAf/9oACAEBAAEFAKf/2gAIAQICBj8AH//a AAgBAwIGPwAf/9oACAEBAQY/AE//2Q=="
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4120" /></g></g><g
display="none"
id="g4122"><defs
id="defs4124"><path
id="SVGID_9_"
d="M10.4,7.7c0.2-0.2,0.2-0.2,0.2-0.2c0.3-0.2,0.4-0.5,0.2-0.8l0,0c-0.2-0.3-0.6-0.4-0.9-0.2c0,0,0,0-0.3,0.2 c-2,1.4-3.2,3.7-3.2,6.3c0,1.5,0.5,2.9,1.3,4.1c0.1,0.2,0.1,0.2,0.1,0.2c0.2,0.2,0.6,0.3,0.8,0.1l0,0C9,17.3,9.1,17,8.9,16.8 c0,0,0,0-0.1-0.2c-0.7-1-1.1-2.2-1.1-3.5C7.6,10.8,8.7,8.9,10.4,7.7L10.4,7.7z" /></defs><clipPath
id="SVGID_10_"
display="inline"><use
xlink:href="#SVGID_9_"
overflow="visible"
id="use4128" /></clipPath><g
display="inline"
clip-path="url(#SVGID_10_)"
id="g4130"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAF/AAABigAAAav/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABlAAEBAQAAAAAAAAAAAAAAAAAABQYBAQEBAAAAAAAAAAAAAAAAAAABAhAAAQUAAAAAAAAAAAAA AAAAAQAQIDBAEQEAAAAAAAAAAAAAAAAAAABAEgEAAAAAAAAAAAAAAAAAAAAw/9oADAMBAAIRAxEA AADKhpJrSUBKwaSa0lAQAAD/2gAIAQIAAQUAp//aAAgBAwABBQBFzH//2gAIAQEAAQUA0//aAAgB AgIGPwAf/9oACAEDAgY/AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4132" /></g></g><g
display="none"
id="g4134"><defs
id="defs4136"><path
id="SVGID_11_"
d="M22.6,9.6c-0.2-0.2-0.2-0.2-0.2-0.2c-0.3-0.1-0.3-0.5-0.2-0.7l0,0c0.2-0.3,0.6-0.4,0.9-0.2 c0,0,0,0,0.3,0.2c1.3,1,2.2,2.5,2.2,4.3c0,1-0.3,2-0.9,2.8c-0.2,0.2-0.2,0.2-0.2,0.2c-0.2,0.2-0.6,0.3-0.9,0.1l0,0 c-0.3-0.2-0.3-0.5-0.1-0.7c0,0,0,0,0.2-0.2c0.4-0.6,0.7-1.4,0.7-2.2C24.4,11.6,23.7,10.4,22.6,9.6L22.6,9.6z" /></defs><clipPath
id="SVGID_12_"
display="inline"><use
xlink:href="#SVGID_11_"
overflow="visible"
id="use4140" /></clipPath><g
display="inline"
clip-path="url(#SVGID_12_)"
id="g4142"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAGBAAABjAAAAa3/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABlAAEBAQAAAAAAAAAAAAAAAAAABQcBAQEBAAAAAAAAAAAAAAAAAAABAhAAAQUAAAAAAAAAAAAA AAAAIAAwQAEREQEAAAAAAAAAAAAAAAAAAABAEgEAAAAAAAAAAAAAAAAAAAAw/9oADAMBAAIRAxEA AADP60msoKBJrSTNZJLWSQCAAf/aAAgBAgABBQBn/9oACAEDAAEFAKDVof/aAAgBAQABBQCT/9oA CAECAgY/AB//2gAIAQMCBj8AH//aAAgBAQEGPwBP/9k="
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4144" /></g></g><g
display="none"
id="g4146"><defs
id="defs4148"><path
id="SVGID_13_"
d="M24.1,7.7c-0.2-0.2-0.2-0.2-0.2-0.2c-0.3-0.2-0.4-0.5-0.2-0.8l0,0c0.2-0.3,0.6-0.4,0.9-0.2 c0,0,0,0,0.3,0.2c2,1.4,3.2,3.7,3.2,6.3c0,1.5-0.5,2.9-1.3,4.1c-0.1,0.2-0.1,0.2-0.1,0.2c-0.2,0.2-0.6,0.3-0.8,0.1l0,0 c-0.3-0.2-0.4-0.5-0.2-0.7c0,0,0,0,0.1-0.2c0.7-1,1.1-2.2,1.1-3.5C26.8,10.8,25.7,8.9,24.1,7.7L24.1,7.7z" /></defs><clipPath
id="SVGID_14_"
display="inline"><use
xlink:href="#SVGID_13_"
overflow="visible"
id="use4152" /></clipPath><g
display="inline"
clip-path="url(#SVGID_14_)"
id="g4154"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAF2AAABgQAAAaL/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABgAAEBAQAAAAAAAAAAAAAAAAAABQcBAQEAAAAAAAAAAAAAAAAAAAACEAEBAAAAAAAAAAAAAAAA AAAwQBEBAAAAAAAAAAAAAAAAAAAAQBIBAAAAAAAAAAAAAAAAAAAAMP/aAAwDAQACEQMRAAAAz8FY KAkhNYKAkhIAH//aAAgBAgABBQAf/9oACAEDAAEFAB//2gAIAQEAAQUAp//aAAgBAgIGPwAf/9oA CAEDAgY/AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image4156" /></g></g></g><path
style="fill:#4d4d4d"
d="M 15.554835,33.841399 C 8.3947255,33.228684 2.4312345,28.149747 0.59813985,21.103207 0.10083332,19.191525 -0.02273828,16.242414 0.31214571,14.277781 2.2480598,2.9205359 14.484256,-3.2512421 24.702064,1.9758247 c 4.319052,2.2094736 7.445658,6.127025 8.695067,10.8946833 0.441195,1.683571 0.60632,4.857223 0.341897,6.571214 -1.366292,8.85635 -9.323985,15.157878 -18.184193,14.399677 l 0,0 z m 3.289187,-5.082093 c 1.192064,-0.498075 2.043513,-1.788417 2.203596,-3.339471 l 0.07952,-0.770513 2.40248,0 c 2.19119,0 2.434855,-0.02546 2.770565,-0.289535 0.463525,-0.364609 0.729892,-1.148351 0.597445,-1.75789 -0.05771,-0.265579 -0.842386,-1.445795 -1.822672,-2.741434 -0.946738,-1.251298 -1.763817,-2.433912 -1.815732,-2.62803 -0.05192,-0.194118 -0.04168,-1.109524 0.02275,-2.034234 0.07281,-1.045072 0.06208,-1.998346 -0.02835,-2.519147 -0.472931,-2.7235175 -2.601797,-4.6262446 -5.368562,-4.798286 -1.982845,-0.1232961 -3.560385,0.439189 -4.85443,1.7308884 -1.519678,1.5169236 -1.911679,2.8425216 -1.68582,5.7008036 0.07179,0.908548 0.09619,1.78926 0.05421,1.957137 -0.04198,0.167877 -0.829187,1.295868 -1.7493569,2.506645 -1.8535143,2.43889 -2.1064649,2.902406 -1.9685629,3.607263 0.2383348,1.2182 0.6932346,1.409463 3.3522498,1.409463 l 1.969631,0 0.07584,0.836352 c 0.160443,1.769389 1.18822,2.908753 3.052411,3.383817 0.469535,0.119655 2.208298,-0.04304 2.712793,-0.253829 l 0,0 z"
id="path4164"
inkscape:connector-curvature="0" /><path
style="fill:#4d4d4d"
d=""
id="path4185"
inkscape:connector-curvature="0" /><path
style="fill:#4d4d4d"
d="m 8.3669642,21.55158 c 3.403e-4,-0.03026 0.4522976,-0.651471 1.2013598,-1.651266 1.0801,-1.44164 1.674361,-2.28445 1.802332,-2.556153 l 0.05379,-0.114204 -0.01079,-0.621972 c -0.0063,-0.364619 -0.02921,-0.882002 -0.05532,-1.250414 -0.02449,-0.345644 -0.04871,-0.798123 -0.05381,-1.005509 -0.0087,-0.35229 -0.0059,-0.328104 0.04166,0.368088 0.02801,0.409834 0.06381,0.838073 0.07954,0.951642 0.06077,0.438616 0.08493,1.224907 0.04747,1.544645 -0.03653,0.311813 -0.04714,0.334172 -0.336479,0.709345 -0.52297,0.678116 -1.101055,1.446158 -1.4591497,1.938621 -0.2010676,0.276515 -0.4595633,0.619914 -0.5744347,0.763109 -0.1148715,0.143195 -0.3167626,0.401755 -0.448647,0.574577 -0.2637637,0.345637 -0.2878119,0.374867 -0.2875264,0.349491 z"
id="path4189"
inkscape:connector-curvature="0" /><path
style="fill:#4d4d4d"
d=""
id="path4191"
inkscape:connector-curvature="0" /><path
style="fill:#4d4d4d"
d="M 8.0992284,24.294925 C 7.9869748,24.183906 7.943745,24.124911 7.8854203,24.003148 7.845212,23.919206 7.8075961,23.826286 7.8018294,23.79666 c -0.00592,-0.03041 0.016438,0.0025 0.051332,0.07545 0.083717,0.175136 0.1559876,0.277618 0.3044999,0.431789 0.1680336,0.174436 0.1194765,0.166975 -0.058433,-0.009 l 0,0 z"
id="path4193"
inkscape:connector-curvature="0" /><path
style="fill:#666666"
d="M 15.057513,33.736227 C 14.012557,33.618354 12.024579,33.129199 11.030281,32.7453 5.5747336,30.638917 1.5604231,25.835024 0.45629465,20.091494 0.13865876,18.439194 0.14486815,15.253682 0.46866899,13.743263 1.9487719,6.8390938 7.0673563,1.8024304 14.007892,0.42073016 c 1.510744,-0.30075417 4.182247,-0.3204764 5.721919,-0.0422417 3.576668,0.64634138 6.60901,2.22732168 9.151468,4.77132628 2.445635,2.4471219 4.08478,5.5472643 4.677892,8.8473773 0.262279,1.459344 0.262077,4.936006 -4.07e-4,6.133649 -0.8003,3.652236 -2.444859,6.619649 -5.018552,9.055387 -3.638895,3.443841 -8.561645,5.105113 -13.482748,4.549999 l 4.9e-5,0 z m 3.696993,-4.909988 c 1.071985,-0.329898 2.026503,-1.6043 2.259429,-3.016623 0.05801,-0.351745 0.123728,-0.737058 0.146038,-0.856249 0.03978,-0.212523 0.08638,-0.217473 2.410864,-0.256066 2.060654,-0.03421 2.406416,-0.06302 2.646746,-0.220487 0.658772,-0.431644 0.939797,-1.436972 0.598217,-2.140045 -0.111957,-0.230443 -0.840556,-1.309828 -1.619109,-2.398634 -2.110004,-2.95084 -1.89502,-2.384674 -1.871502,-4.928655 0.02531,-2.737896 -0.106735,-3.348622 -1.023085,-4.73187 -1.03613,-1.5640573 -2.80581,-2.4195002 -5.014067,-2.4237417 -1.806889,-0.00347 -3.018859,0.5069288 -4.312744,1.8162363 -1.52419,1.5423574 -1.785133,2.4012374 -1.676946,5.5195874 0.08203,2.364422 0.28128,1.844036 -1.7876793,4.66897 -1.6134045,2.202925 -1.9694452,2.846948 -1.8922168,3.422728 0.1111709,0.828842 0.5289188,1.288237 1.3083809,1.438821 0.2434663,0.04704 1.2539702,0.08751 2.2455632,0.08994 l 1.802898,0.0044 0.0018,0.330108 c 0.001,0.181559 0.06902,0.647613 0.151229,1.035674 0.2675,1.262767 1.052332,2.149062 2.3674,2.673458 0.506356,0.201913 0.709002,0.224806 1.644048,0.185725 0.586576,-0.02452 1.313224,-0.120504 1.614773,-0.213304 l -4e-6,0 z"
id="path5633"
inkscape:connector-curvature="0" /></svg>

After

Width:  |  Height:  |  Size: 16 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1,173 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 33.9 33.9"
enable-background="new 0 0 33.9 33.9"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
width="100%"
height="100%"
sodipodi:docname="bell_yellow_off.svg"><metadata
id="metadata3712"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs3710" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1025"
id="namedview3708"
showgrid="false"
inkscape:zoom="6.9616519"
inkscape:cx="16.95"
inkscape:cy="16.95"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" /><g
id="g3622"><g
id="g3624"><defs
id="defs3626"><path
id="SVGID_1_"
d="M17,0c9.4,0,17,7.6,17,17c0,9.4-7.6,17-17,17c-9.4,0-17-7.6-17-17C0,7.6,7.6,0,17,0L17,0z" /></defs><clipPath
id="SVGID_2_"><use
xlink:href="#SVGID_1_"
overflow="visible"
id="use3630" /></clipPath><g
clip-path="url(#SVGID_2_)"
id="g3632"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAFzAAABfgAAAZ//2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABgAAEBAAAAAAAAAAAAAAAAAAAABgEBAQEAAAAAAAAAAAAAAAAAAAUGEAEBAAAAAAAAAAAAAAAA AAAwQBEBAAAAAAAAAAAAAAAAAAAAQBIBAAAAAAAAAAAAAAAAAAAAMP/aAAwDAQACEQMRAAAApRkK IAAAAAAAH//aAAgBAgABBQAf/9oACAEDAAEFAB//2gAIAQEAAQUAp//aAAgBAgIGPwAf/9oACAED AgY/AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3634" /></g></g><g
id="g3636"><defs
id="defs3638"><path
id="SVGID_3_"
d="M13.1,25.2c0-0.1,0-0.3,0.1-0.5c-2,0-4.1,0-4.1,0c-0.8,0-1.4-0.7-1.4-1.6c0-0.5,0.2-0.9,0.5-1.3 c0.1-0.1,0.6-0.8,1.1-1.4c1-1.4,1.8-2.4,2.1-2.8c0,0,0.1-0.2,0.1-0.7c0-0.4,0-0.9-0.1-1.5l-0.1-1.6c0,0,0,0,0,0s0,0,0,0l0-0.2 c0-3,2.8-5.7,5.8-5.7h0.6c3,0,5.6,2.6,5.6,5.6l0,0.2c0,0,0,0,0,0l-0.1,1.6c0,0.6-0.1,1.1-0.1,1.5c0,0.5,0,0.7,0.1,0.7 c0.3,0.4,1.1,1.4,2.1,2.8c0.4,0.6,1,1.3,1.1,1.4c0.3,0.3,0.5,0.8,0.5,1.3c0,0.9-0.6,1.6-1.4,1.6c0,0-2.4,0-4.6,0 c0.1,0.2,0.1,0.3,0.1,0.5c0,2.3-1.5,3.9-3.8,3.9C14.7,29.1,13.1,27.5,13.1,25.2 M11.4,17.6C11.4,17.6,11.4,17.6,11.4,17.6 C11.4,17.6,11.4,17.6,11.4,17.6 M23.2,17.6C23.2,17.6,23.2,17.6,23.2,17.6C23.2,17.6,23.2,17.6,23.2,17.6" /></defs><clipPath
id="SVGID_4_"><use
xlink:href="#SVGID_3_"
overflow="visible"
id="use3642" /></clipPath><g
clip-path="url(#SVGID_4_)"
id="g3644"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAFwAAABewAAAZz/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABfAAEBAAAAAAAAAAAAAAAAAAAABgEBAQAAAAAAAAAAAAAAAAAAAAIQAQEAAAAAAAAAAAAAAAAA ADBAEQEAAAAAAAAAAAAAAAAAAABAEgEAAAAAAAAAAAAAAAAAAAAw/9oADAMBAAIRAxEAAACVCgAA AAAAAP/aAAgBAgABBQAf/9oACAEDAAEFAB//2gAIAQEAAQUAp//aAAgBAgIGPwAf/9oACAEDAgY/ AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3646" /></g></g><g
id="g3648"><defs
id="defs3650"><path
id="SVGID_5_"
d="M25.4,23.7c-0.4,0-15.9,0-16.3,0c-0.4,0-0.6-0.7-0.2-1.2c0.4-0.4,2.7-3.7,3.2-4.2c0.5-0.5,0.3-2.1,0.2-4.5 c-0.1-2.5,2.3-4.8,4.8-4.8c0.2,0,0.4,0,0.6,0c2.5,0,4.7,2.3,4.6,4.8c-0.1,2.5-0.4,4,0.2,4.5c0.5,0.5,2.9,3.8,3.2,4.2 C26,23,25.9,23.7,25.4,23.7L25.4,23.7z M17,28.1c-1.6,0-3-0.9-3-2.9c0,0,1.4,0,1.4,0h3.1c0,0,1.3,0,1.3,0 C19.9,27.2,18.6,28.1,17,28.1L17,28.1z" /></defs><clipPath
id="SVGID_6_"><use
xlink:href="#SVGID_5_"
overflow="visible"
id="use3654" /></clipPath><g
clip-path="url(#SVGID_6_)"
id="g3656"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAFvAAABegAAAZv/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABeAAEBAAAAAAAAAAAAAAAAAAAABgEBAAAAAAAAAAAAAAAAAAAAABABAQAAAAAAAAAAAAAAAAAA MEARAQAAAAAAAAAAAAAAAAAAAEASAQAAAAAAAAAAAAAAAAAAADD/2gAMAwEAAhEDEQAAALwAAAAA AAAH/9oACAECAAEFAB//2gAIAQMAAQUAH//aAAgBAQABBQCn/9oACAECAgY/AB//2gAIAQMCBj8A H//aAAgBAQEGPwBP/9k="
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3658" /></g></g><g
display="none"
id="g3660"><defs
id="defs3662"><path
id="SVGID_7_"
d="M11.8,9.6C12,9.5,12,9.5,12,9.5c0.3-0.1,0.3-0.5,0.2-0.7l0,0c-0.2-0.3-0.6-0.4-0.9-0.2c0,0,0,0-0.3,0.2 c-1.3,1-2.2,2.5-2.2,4.3c0,1,0.3,2,0.9,2.8c0.2,0.2,0.2,0.2,0.2,0.2c0.2,0.2,0.6,0.3,0.9,0.1l0,0c0.3-0.2,0.3-0.5,0.1-0.7 c0,0,0,0-0.2-0.2C10.3,14.6,10,13.8,10,13C10,11.6,10.7,10.4,11.8,9.6L11.8,9.6z" /></defs><clipPath
id="SVGID_8_"
display="inline"><use
xlink:href="#SVGID_7_"
overflow="visible"
id="use3666" /></clipPath><g
display="inline"
clip-path="url(#SVGID_8_)"
id="g3668"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAF3AAABggAAAaP/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABgAAEBAQAAAAAAAAAAAAAAAAAABQYBAQEAAAAAAAAAAAAAAAAAAAABEAEBAAAAAAAAAAAAAAAA AAAwQBEBAAAAAAAAAAAAAAAAAAAAQBIBAAAAAAAAAAAAAAAAAAAAMP/aAAwDAQACEQMRAAAAyYsS 6kuUColipLAAAAD/2gAIAQIAAQUAH//aAAgBAwABBQAf/9oACAEBAAEFAKf/2gAIAQICBj8AH//a AAgBAwIGPwAf/9oACAEBAQY/AE//2Q=="
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3670" /></g></g><g
display="none"
id="g3672"><defs
id="defs3674"><path
id="SVGID_9_"
d="M10.4,7.7c0.2-0.2,0.2-0.2,0.2-0.2c0.3-0.2,0.4-0.5,0.2-0.8l0,0c-0.2-0.3-0.6-0.4-0.9-0.2c0,0,0,0-0.3,0.2 c-2,1.4-3.2,3.7-3.2,6.3c0,1.5,0.5,2.9,1.3,4.1c0.1,0.2,0.1,0.2,0.1,0.2c0.2,0.2,0.6,0.3,0.8,0.1l0,0C9,17.3,9.1,17,8.9,16.8 c0,0,0,0-0.1-0.2c-0.7-1-1.1-2.2-1.1-3.5C7.6,10.8,8.7,8.9,10.4,7.7L10.4,7.7z" /></defs><clipPath
id="SVGID_10_"
display="inline"><use
xlink:href="#SVGID_9_"
overflow="visible"
id="use3678" /></clipPath><g
display="inline"
clip-path="url(#SVGID_10_)"
id="g3680"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAF/AAABigAAAav/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABlAAEBAQAAAAAAAAAAAAAAAAAABQYBAQEBAAAAAAAAAAAAAAAAAAABAhAAAQUAAAAAAAAAAAAA AAAAAQAQIDBAEQEAAAAAAAAAAAAAAAAAAABAEgEAAAAAAAAAAAAAAAAAAAAw/9oADAMBAAIRAxEA AADKhpJrSUBKwaSa0lAQAAD/2gAIAQIAAQUAp//aAAgBAwABBQBFzH//2gAIAQEAAQUA0//aAAgB AgIGPwAf/9oACAEDAgY/AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3682" /></g></g><g
display="none"
id="g3684"><defs
id="defs3686"><path
id="SVGID_11_"
d="M22.6,9.6c-0.2-0.2-0.2-0.2-0.2-0.2c-0.3-0.1-0.3-0.5-0.2-0.7l0,0c0.2-0.3,0.6-0.4,0.9-0.2 c0,0,0,0,0.3,0.2c1.3,1,2.2,2.5,2.2,4.3c0,1-0.3,2-0.9,2.8c-0.2,0.2-0.2,0.2-0.2,0.2c-0.2,0.2-0.6,0.3-0.9,0.1l0,0 c-0.3-0.2-0.3-0.5-0.1-0.7c0,0,0,0,0.2-0.2c0.4-0.6,0.7-1.4,0.7-2.2C24.4,11.6,23.7,10.4,22.6,9.6L22.6,9.6z" /></defs><clipPath
id="SVGID_12_"
display="inline"><use
xlink:href="#SVGID_11_"
overflow="visible"
id="use3690" /></clipPath><g
display="inline"
clip-path="url(#SVGID_12_)"
id="g3692"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAGBAAABjAAAAa3/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABlAAEBAQAAAAAAAAAAAAAAAAAABQcBAQEBAAAAAAAAAAAAAAAAAAABAhAAAQUAAAAAAAAAAAAA AAAAIAAwQAEREQEAAAAAAAAAAAAAAAAAAABAEgEAAAAAAAAAAAAAAAAAAAAw/9oADAMBAAIRAxEA AADP60msoKBJrSTNZJLWSQCAAf/aAAgBAgABBQBn/9oACAEDAAEFAKDVof/aAAgBAQABBQCT/9oA CAECAgY/AB//2gAIAQMCBj8AH//aAAgBAQEGPwBP/9k="
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3694" /></g></g><g
display="none"
id="g3696"><defs
id="defs3698"><path
id="SVGID_13_"
d="M24.1,7.7c-0.2-0.2-0.2-0.2-0.2-0.2c-0.3-0.2-0.4-0.5-0.2-0.8l0,0c0.2-0.3,0.6-0.4,0.9-0.2 c0,0,0,0,0.3,0.2c2,1.4,3.2,3.7,3.2,6.3c0,1.5-0.5,2.9-1.3,4.1c-0.1,0.2-0.1,0.2-0.1,0.2c-0.2,0.2-0.6,0.3-0.8,0.1l0,0 c-0.3-0.2-0.4-0.5-0.2-0.7c0,0,0,0,0.1-0.2c0.7-1,1.1-2.2,1.1-3.5C26.8,10.8,25.7,8.9,24.1,7.7L24.1,7.7z" /></defs><clipPath
id="SVGID_14_"
display="inline"><use
xlink:href="#SVGID_13_"
overflow="visible"
id="use3702" /></clipPath><g
display="inline"
clip-path="url(#SVGID_14_)"
id="g3704"><image
overflow="visible"
width="35"
height="35"
xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAAF2AAABgQAAAaL/2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIACMAIwMBIgACEQEDEQH/ xABgAAEBAQAAAAAAAAAAAAAAAAAABQcBAQEAAAAAAAAAAAAAAAAAAAACEAEBAAAAAAAAAAAAAAAA AAAwQBEBAAAAAAAAAAAAAAAAAAAAQBIBAAAAAAAAAAAAAAAAAAAAMP/aAAwDAQACEQMRAAAAz8FY KAkhNYKAkhIAH//aAAgBAgABBQAf/9oACAEDAAEFAB//2gAIAQEAAQUAp//aAAgBAgIGPwAf/9oA CAEDAgY/AB//2gAIAQEBBj8AT//Z"
transform="matrix(1 0 0 1 -0.6901 -0.4026)"
id="image3706" /></g></g></g><path
style="fill:#00ff00"
d="M 15.554835,33.841399 C 8.3947255,33.228684 2.4312345,28.149747 0.59813985,21.103207 0.10083332,19.191525 -0.02273828,16.242414 0.31214571,14.277781 2.2480598,2.9205359 14.484256,-3.2512421 24.702064,1.9758247 c 4.319052,2.2094736 7.445658,6.127025 8.695067,10.8946833 0.441195,1.683571 0.60632,4.857223 0.341897,6.571214 -1.366292,8.85635 -9.323985,15.157878 -18.184193,14.399677 l 0,0 z m 3.289187,-5.082093 c 1.192064,-0.498075 2.043513,-1.788417 2.203596,-3.339471 l 0.07952,-0.770513 2.40248,0 c 2.19119,0 2.434855,-0.02546 2.770565,-0.289535 0.463525,-0.364609 0.729892,-1.148351 0.597445,-1.75789 -0.05771,-0.265579 -0.842386,-1.445795 -1.822672,-2.741434 -0.946738,-1.251298 -1.763817,-2.433912 -1.815732,-2.62803 -0.05192,-0.194118 -0.04168,-1.109524 0.02275,-2.034234 0.07281,-1.045072 0.06208,-1.998346 -0.02835,-2.519147 -0.472931,-2.7235175 -2.601797,-4.6262446 -5.368562,-4.798286 -1.982845,-0.1232961 -3.560385,0.439189 -4.85443,1.7308884 -1.519678,1.5169236 -1.911679,2.8425216 -1.68582,5.7008036 0.07179,0.908548 0.09619,1.78926 0.05421,1.957137 -0.04198,0.167877 -0.829187,1.295868 -1.7493569,2.506645 -1.8535143,2.43889 -2.1064649,2.902406 -1.9685629,3.607263 0.2383348,1.2182 0.6932346,1.409463 3.3522498,1.409463 l 1.969631,0 0.07584,0.836352 c 0.160443,1.769389 1.18822,2.908753 3.052411,3.383817 0.469535,0.119655 2.208298,-0.04304 2.712793,-0.253829 l 0,0 z"
id="path3714"
inkscape:connector-curvature="0" /></svg>

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -11,7 +11,7 @@
hz-table>
<thead>
<tr>
<th class="state-col" st-sort="normalized_severity"></th>
<th class="state-col" st-sort="aggregated_state"></th>
<th class="timestamp-col" st-sort="update_timestamp">{$ 'Time' | translate $}</th>
<th class="name-col" st-sort="name">{$ 'Name' | translate $}</th>
<th class="rca-col">{$ 'RCA' | translate $}</th>
@ -19,7 +19,7 @@
</thead>
<tbody>
<tr ng-repeat="alarm in alarmsCtrl.computeAlarms track by $index">
<td title="{$ alarm.normalized_severity $}"><i class="fa" ng-class="{'orange fa-exclamation-triangle': alarm.normalized_severity == 'SEVER' || alarm.normalized_severity == 'SEVERE', 'orange fa-exclamation-triangle': alarm.normalized_severity == 'WARNING', 'red fa-exclamation-circle': alarm.normalized_severity == 'CRITICAL', 'green fa-check': alarm.normalized_severity == 'DISABLED', 'gray fa-circle-o-notch': alarm.normalized_severity == 'UNKNOWN'}"></i></td>
<td title="{$ alarm.aggregated_state $}"><i class="fa" ng-class="{'orange fa-exclamation-triangle': alarm.operational_severity == 'SEVERE', 'yellow fa-exclamation-triangle': alarm.operational_severity == 'WARNING', 'red fa-exclamation-circle': alarm.operational_severity == 'CRITICAL', 'green fa-check': alarm.operational_severity == 'OK', 'gray fa-circle-o-notch': alarm.operational_severity == 'N/A'}"></i></td>
<td title="{$alarm.update_timestamp | date:'yyyy-MM-dd hh:mm:ss'$}"><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"yyyy-MM-dd hh:mm:ss"$} </td>
<td class="ellipsis" title="{$alarm.name$}">{$alarm.name$}</td>
<td title="{$ 'Root Cause Analysis' | translate $}" ng-click="alarmsCtrl.onAlarmClick(alarm)"><i class="fa fa-sitemap"></i></td>

View File

@ -111,7 +111,7 @@ function hzRootCauseAnalysisGraph($filter) {
alertResourceName = key.resource_name, // host-0
alertResourceType = key.resource_type, // nova.host
alertSeverity = key.severity, //WARNING
alertNormalizedSeverity = key.normalized_severity ? key.normalized_severity.toUpperCase() : key.normalized_severity, //WARNING
alertOperationalSeverity = key.operational_severity ? key.operational_severity.toUpperCase() : key.operational_severity, //WARNING
alertState = key.state ? key.state.toUpperCase() : key.state, //Active
alertTimeStamp = $filter('date')(key.update_timestamp, 'MM/dd/yyyy h:mma'), //2015-12-01T12:46:41Z
alertType = key.type, //nagios
@ -122,28 +122,36 @@ function hzRootCauseAnalysisGraph($filter) {
html += '<div style="padding: 10px; text-shadow: none; width: 378px; height: 115px; color: #44575e; clear:both"';
html+='>';
switch (alertState + '_' + alertNormalizedSeverity) {
switch (alertState + '_' + alertOperationalSeverity) {
case 'ACTIVE_CRITICAL':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_red_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'ACTIVE_WARNING':
case 'ACTIVE_SEVER':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_yellow_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'ACTIVE_SEVERE':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_orange_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'ACTIVE_DISABLED':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_orange_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
case 'ACTIVE_N/A':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_gray_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'ACTIVE_OK':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_green_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'INACTIVE_CRITICAL':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_red_off.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'INACTIVE_WARNING':
case 'INACTIVE_SEVER':
case 'INACTIVE_SEVER':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_yellow_off.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'INACTIVE_SEVERE':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_orange_off.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'INACTIVE_DISABLED':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_orange_off.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
case 'INACTIVE_N/A':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_gray_off.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
case 'INACTIVE_OK':
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_green_off.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';
break;
default:
html += '<img src="' + STATIC_URL + 'dashboard/project/assets/bell_yellow_on.svg" style="width: 80px; height: 80px; padding-top: 10px;float: left;">';

View File

@ -111,24 +111,22 @@ function hzSunburst() {
}
function getColor(d) {
if (d.aggregated_state) {
switch (d.aggregated_state.toUpperCase()) {
if (d.operational_state) {
switch (d.operational_state.toUpperCase()) {
case 'ERROR':
case 'DELETED':
return '#FA3C3C';
break;
case 'TERMINATED':
case 'SUSPEND':
case 'RESCUED':
case 'RESIZED':
case 'SUBOPTIMAL':
return '#FCD20E';
break;
case 'RUNNING':
case 'OK':
return '#87CE53';
break;
case 'TRANSIENT':
case 'UNRECOGNIZED':
case 'UNDEFINED':
return '#97A560';
break;
case 'N/A':
return '#AEAEAE';
break;
default:

View File

@ -226,16 +226,24 @@ function hzEntitiesGraph() {
.attr('transform', 'scale(1)')
.attr('class', function(d) {
var cls = '';
var severity = d.severity || d.normalized_severity;
var severity = d.operational_severity;
if (severity) {
switch (severity.toLowerCase()) {
case 'critical':
case 'severe':
cls = 'red';
break;
case 'warning':
case 'severe':
cls = 'orange';
break;
case 'warning':
cls = 'yellow';
break;
case 'ok':
cls = 'green';
break;
case 'n/a':
cls = 'gray';
break;
default: //'DISABLED', 'UNKNOWN', 'UNDEFINED'
cls = 'gray';
break;

View File

@ -1,6 +1,7 @@
$blue: #428BCA;
$vitrage_red: #FA3C3C;
$vitrage_orange: #FCD20E;
$vitrage_orange: #fc9100;
$vitrage_yellow: #FCD20E;
$vitrage_green: #87CE53;
$vitrage_gray: #AEAEAE;
$dark_gray: darkgray;
@ -68,6 +69,10 @@ $dark_gray: darkgray;
stroke: $vitrage_orange;
}
&.yellow {
stroke: $vitrage_yellow;
}
&.green {
stroke: $vitrage_green;
}

View File

@ -17,7 +17,11 @@
}
.orange {
color: #FCD20E;
color: #fc9d00;
}
.yellow {
color: #FFC600;
}
.green {