Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgr/dashboard: Cluster expansion review page minor bug fixes #43661

Merged
merged 1 commit into from Oct 27, 2021

Conversation

nizamial09
Copy link
Member

@nizamial09 nizamial09 commented Oct 26, 2021

Fix the Total Memory coming up as NaN Undefined
Remove Add Button in the Cluster Details table

BEFORE
135472198-6e10cfe1-8974-4d62-ae8f-e338b11cac4c

AFTER
Screenshot 2021-10-26 152716

Fixes: https://tracker.ceph.com/issues/53038
Signed-off-by: Nizamudeen A nia@redhat.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@nizamial09 nizamial09 requested a review from a team as a code owner October 26, 2021 08:03
@nizamial09 nizamial09 requested review from pereman2 and removed request for a team October 26, 2021 08:03
@nizamial09 nizamial09 added this to In progress in Dashboard via automation Oct 26, 2021
@nizamial09 nizamial09 added the skip-teuthology For PRs whose changes do not have an effect on QA runs/changes are not being tested in Teuthology label Oct 26, 2021
@nizamial09 nizamial09 changed the title mgr/dashboard: Cluster expansion review page minor bug fixes mgr/dashboard: Cluster expansion review page minor bug fixes Oct 26, 2021
@nizamial09
Copy link
Member Author

jenkins test dashboard

@nizamial09
Copy link
Member Author

jenkins test dashboard cephadm

@avanthakkar
Copy link
Contributor

avanthakkar commented Oct 26, 2021

I think we should also hide these actions in review page (it was hidden before rebase in gather facts)
You can set toolHeader=false for that.
Screenshot from 2021-10-26 14-29-15

@nizamial09 nizamial09 removed this from In progress in Dashboard Oct 26, 2021
Fix the Total Memory coming up as NaN Undefined
Remove `Add` Button in the Cluster Details table

Fixes: https://tracker.ceph.com/issues/53038
Signed-off-by: Nizamudeen A <nia@redhat.com>
@nizamial09
Copy link
Member Author

You can set toolHeader=false for that.

@avanthakkar Done!

@alfonsomthd
Copy link
Contributor

alfonsomthd commented Oct 26, 2021

The make check error is not related to this PR:

242/252 Test   #4: run-tox-mgr ...............................***Failed  531.13 sec
Requirement already satisfied: tox in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (3.24.4)
Requirement already satisfied: packaging>=14 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (21.0)
Requirement already satisfied: pluggy>=0.12.0 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (1.0.0)
Requirement already satisfied: filelock>=3.0.0 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (3.3.1)
Requirement already satisfied: toml>=0.9.4 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (0.10.2)
Requirement already satisfied: six>=1.14.0 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (1.16.0)
Requirement already satisfied: py>=1.4.17 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (1.10.0)
Requirement already satisfied: virtualenv!=20.0.0,!=20.0.1,!=20.0.2,!=20.0.3,!=20.0.4,!=20.0.5,!=20.0.6,!=20.0.7,>=16.0.0 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from tox) (20.9.0)
Requirement already satisfied: pyparsing>=2.0.2 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from packaging>=14->tox) (3.0.1)
Requirement already satisfied: platformdirs<3,>=2 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from virtualenv!=20.0.0,!=20.0.1,!=20.0.2,!=20.0.3,!=20.0.4,!=20.0.5,!=20.0.6,!=20.0.7,>=16.0.0->tox) (2.4.0)
Requirement already satisfied: distlib<1,>=0.3.1 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from virtualenv!=20.0.0,!=20.0.1,!=20.0.2,!=20.0.3,!=20.0.4,!=20.0.5,!=20.0.6,!=20.0.7,>=16.0.0->tox) (0.3.3)
Requirement already satisfied: backports.entry-points-selectable>=1.0.4 in /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/lib/python3.8/site-packages (from virtualenv!=20.0.0,!=20.0.1,!=20.0.2,!=20.0.3,!=20.0.4,!=20.0.5,!=20.0.6,!=20.0.7,>=16.0.0->tox) (1.1.0)
.tox create: /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/.tox/.tox
.tox installdeps: cython, tox >= 3.24.4
py3 create: /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/.tox/py3
py3 installdeps: cython, -rrequirements.txt, -rrook/requirements.txt
py3 installed: asyncmock==0.4.2,asyncssh==2.7.2,attrs==21.2.0,beautifulsoup4==4.10.0,cachetools==4.2.4,-e git+https://github.com/ceph/ceph.git@76cdca2f440a30cb5ded785ee6965b300a23614d#egg=ceph&subdirectory=src/python-common,certifi==2021.10.8,cffi==1.15.0,charset-normalizer==2.0.7,cheroot==8.5.2,CherryPy==18.6.1,coverage==6.0.2,cryptography==35.0.0,Cython==0.29.24,google-auth==2.3.1,idna==3.3,iniconfig==1.1.1,jaraco.classes==3.2.1,jaraco.collections==3.4.0,jaraco.functools==3.3.0,jaraco.text==3.5.1,Jinja2==3.0.2,jsonpatch==1.32,jsonpointer==2.1,kubernetes==19.15.0,logutils==0.3.5,Mako==1.1.5,MarkupSafe==2.0.1,mock==4.0.3,more-itertools==8.10.0,numpy==1.21.3,oauthlib==3.1.1,packaging==21.0,pecan==1.4.0,pluggy==1.0.0,portend==3.0.0,prettytable==2.2.1,py==1.10.0,pyasn1==0.4.8,pyasn1-modules==0.2.8,pycparser==2.20,pyfakefs==4.5.1,pyOpenSSL==21.0.0,pyparsing==3.0.1,pytest==6.2.5,pytest-cov==2.7.1,python-dateutil==2.8.2,pytz==2021.3,PyYAML==6.0,requests==2.26.0,requests-mock==1.9.3,requests-oauthlib==1.3.0,rsa==4.7.2,scipy==1.7.1,six==1.16.0,soupsieve==2.2.1,tempora==4.1.2,toml==0.10.2,urllib3==1.26.7,waitress==2.0.0,wcwidth==0.2.5,WebOb==1.8.7,websocket-client==1.2.1,WebTest==3.0.0,Werkzeug==2.0.2,zc.lockfile==2.0
py3 run-test-pre: PYTHONHASHSEED='761490109'
py3 run-test: commands[0] | pytest --doctest-modules
============================= test session starts ==============================
platform linux -- Python 3.8.10, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
cachedir: .tox/py3/.pytest_cache
rootdir: /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr, configfile: tox.ini
plugins: requests-mock-1.9.3, cov-2.7.1, pyfakefs-4.5.1
collected 1126 items / 2 errors / 1124 selected

==================================== ERRORS ====================================
____________________ ERROR collecting k8sevents/__init__.py ____________________
k8sevents/__init__.py:1: in <module>
    from .module import Module
k8sevents/module.py:70: in <module>
    from kubernetes.client.models.v1_event import V1Event
E   ModuleNotFoundError: No module named 'kubernetes.client.models.v1_event'
_____________________ ERROR collecting k8sevents/module.py _____________________
k8sevents/module.py:70: in <module>
    from kubernetes.client.models.v1_event import V1Event
E   ModuleNotFoundError: No module named 'kubernetes.client.models.v1_event'
=============================== warnings summary ===============================
osd_perf_query/module.py:61
  /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/osd_perf_query/module.py:61: DeprecationWarning: invalid escape sequence \.
    'regex': '^(?:rbd|journal)_data\.(?:([0-9]+)\.)?([^.]+)\.'},

rook/rook_cluster.py:105
  /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/rook/rook_cluster.py:105: DeprecationWarning: invalid escape sequence \d
    coeff_and_unit = re.search('(\d+)(\D+)', size_str)

stats/fs/perf_stats.py:24
  /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/stats/fs/perf_stats.py:24: DeprecationWarning: invalid escape sequence \d
    CLIENT_ID_ALL = "\d*"

stats/fs/perf_stats.py:28
  /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/stats/fs/perf_stats.py:28: DeprecationWarning: invalid escape sequence \s
    MDS_PERF_QUERY_REGEX_MATCH_CLIENTS = '^(client.{0}\s+{1}):.*'

zabbix/module.py:134
  /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/zabbix/module.py:134: DeprecationWarning: invalid escape sequence \[
    uri = re.match("(?:(?:\[?)([a-z0-9-\.]+|[a-f0-9:\.]+)(?:\]?))(?:((?::))([0-9]{1,5}))?$", server)

-- Docs: https://docs.pytest.org/en/stable/warnings.html
=========================== short test summary info ============================
ERROR k8sevents/__init__.py - ModuleNotFoundError: No module named 'kubernete...
ERROR k8sevents/module.py - ModuleNotFoundError: No module named 'kubernetes....
!!!!!!!!!!!!!!!!!!! Interrupted: 2 errors during collection !!!!!!!!!!!!!!!!!!!!
======================== 5 warnings, 2 errors in 14.48s ========================
ERROR: InvocationError for command /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/.tox/py3/bin/pytest --doctest-modules (exited with code 2)

Dashboard automation moved this from In progress to Reviewer approved Oct 26, 2021
@nizamial09
Copy link
Member Author

jenkins test make check

@nizamial09 nizamial09 moved this from Reviewer approved to Ready-to-merge in Dashboard Oct 27, 2021
@epuertat epuertat merged commit b03183b into ceph:master Oct 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-fix dashboard pybind skip-teuthology For PRs whose changes do not have an effect on QA runs/changes are not being tested in Teuthology
Projects
Archived in project
Dashboard
  
Done
5 participants