Merge pull request #254 from scouter-contrib/development

Development - 2.6.3

Author: kranian

docker/.env

@@ -1 +1 @@
-PAPER_VERSION=2.6.2-a
+PAPER_VERSION=2.6.3

docker/Dockerfile

@@ -7,4 +7,4 @@ RUN mkdir -p /var/www;
 COPY default.conf /etc/nginx/conf.d/default.conf
 ## install
 WORKDIR /var/www
-RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime; wget ${INSTALL_URL};unzip scouter-paper-v${PAPER_VERSION}.zip
+RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime; wget ${INSTALL_URL};unzip scouter-paper-v${PAPER_VERSION}.zip;rm -f scouter-paper-v${PAPER_VERSION}.zip

docker/Dockerfile-Dev

@@ -0,0 +1,10 @@
+FROM nginx:1.17.0-alpine
+## url setting
+LABEL maintainer="[email protected]"
+ARG PAPER_VERSION=${PAPER_VERSION:-2.5.0}
+RUN mkdir -p /var/www;
+COPY default.conf /etc/nginx/conf.d/default.conf
+WORKDIR /var/www
+COPY scouter-paper.zip ./
+## install
+RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime; wget ${INSTALL_URL};unzip scouter-paper.zip;rm -f scouter-paper.zip

docker/docker-compose.yml

@@ -3,7 +3,7 @@ services:
   scouter-paper:
     build :
       context : .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-Dev
       args:
         - PAPER_VERSION=${PAPER_VERSION}
     image : scouterapm/scouter-paper:${PAPER_VERSION}

src/App.js

@@ -357,6 +357,11 @@ class App extends Component {
                 server.name = server.protocol + "://" + server.address + ":" + server.port
             });
         }
+        const paramXlogClassicMode = common.getParam(this.props,"xlogClassicMode");
+        if(paramXlogClassicMode && ( paramXlogClassicMode === 'Y' ||  paramXlogClassicMode === 'N')){
+            config.others.xlogClassicMode = paramXlogClassicMode;
+        }
+
 
         this.props.setConfig(config);
         if (localStorage) {

src/common/common.js

@@ -1,7 +1,7 @@
 // local storage access
 import moment from "moment";
 import {Dictionary, DictType} from "./dictionary";
-export const version = "2.6.2";
+export const version = "2.6.3";
 
 export function getData(key) {
     let ls = null;

src/components/Menu/InstanceSelector/InstanceSelector.css

@@ -232,7 +232,7 @@
 }
 
 .instance-selector .instance-selector-content .list-content {
-    height: calc(100% - 30px);
+    height: calc(100% - 83px);
     position: absolute;
     top: 30px;
     overflow-y: auto;

src/components/Paper/LineChart/Line.js

@@ -165,21 +165,27 @@ class Line extends Component {
 
             let instanceMetricCount = {};
             let peakData = [];
-            for (let counterKey in data.counters) {
-                let thisOption = data.box.option.filter((d) => {return d.counterKey === counterKey})[0];
-                if(thisOption){
-                    switch(data.options.type){
-                        case 'STACK AREA':
-                            this.stackAreaPaint(thisOption,counterKey,data);
-                            break;
-                        default :
-                            //- LINE,LINEFILL
-                            this.linePlot(data,thisOption,counterKey,instanceMetricCount,peakData);
+            try {
+                for (let counterKey in data.counters) {
+                    let thisOption = data.box.option.filter((d) => {
+                        return d.counterKey === counterKey
+                    })[0];
+                    if (thisOption) {
+                        switch (data.options.type) {
+                            case 'STACK AREA':
+                                this.stackAreaPaint(thisOption, counterKey, data);
+                                break;
+                            default :
+                                //- LINE,LINEFILL
+                                this.linePlot(data, thisOption, counterKey, instanceMetricCount, peakData);
+                        }
                     }
                 }
+                //-peakpaint
+                this.peakPaint(data.options.type, peakData);
+            }catch (e) {
+                console.error(e);
             }
-            //-peakpaint
-            this.peakPaint(data.options.type,peakData);
         }
         this.moveTooltip();
 

src/components/Paper/XLog/XLog.js

@@ -505,7 +505,7 @@ class XLog extends Component {
         context.drawImage(this.graph._tempCanvas, -pixel, 0, canvas.width, canvas.height);
     };
     isClassMode =()=>{
-        return this.props.box.values.showClassicMode === "Y";
+        return this.props.config.others.xlogClassicMode === "Y" || this.props.box.values.showClassicMode === "Y";
     };
     graphInit = () => {
         let that = this;

src/components/Settings/Settings.js

@@ -1043,6 +1043,7 @@ class Settings extends Component {
                                         </div>
                                     </div>
                                 </div>
+
                             </div>
                         </div>
 
@@ -1072,6 +1073,19 @@ class Settings extends Component {
                                     </select>
                                 </div>
                             </div>
+                            <div className="row">
+                                <div className="label">
+                                    <div>XLOG CLASSIC MODE</div>
+                                </div>
+                                <div className="input">
+                                    <select value={this.state.config.others.xlogClassicMode} onChange={this.onChangeOthers.bind(this, "xlogClassicMode")} disabled={!this.state.edit}>
+                                        {["Y","N"].map((d, i) => {
+                                            return <option key={i} value={d}>{d}</option>
+                                        })}
+                                    </select>
+                                </div>
+                            </div>
+
                         </div>
                     </div>
                     {this.state.edit &&