1602883200
Why Knowing Git Stash Is a Must
As a developer, good knowledge of Git or any version control software is more than a skill — it is a must. And among the many good things that Git has to offer, there is Git Stash. Why is it great? Because it prevents you from committing every tiny change when working on several Git branches at the same time.
Discovering it as a junior dev helped me a lot, so here is a basic rundown of the main commands and the way they can be useful.
In an ideal developer workday, one would be able to focus on a single task until completion and then switch to the next. But in reality, there are always smaller urgent issues that need immediate attention and longer-term work that requires more thinking and trying.
One way to handle this is to commit everything before switching branches, but this can make your work dirtier by increasing the number of commits while breaking apart their logic. Not ideal.
So let’s use git stash instead and learn to use its set of commands.
#version-control #javascript #software-development #programming #git
What is GEEK
Buddha Community
1671543249
Migrating From Jira Server: Guide, Pros, And Cons
February 15, 2022 marked a significant milestone in Atlassian’s Server EOL (End Of Life) roadmap. This was not the final step. We still have two major milestones ahead of us: end of new app sales in Feb 2023, and end of support in Feb 2024. In simpler words, businesses still have enough time to migrate their Jira Server to one of the two available products – Atlassian Cloud or Atlassian DC. But the clock is ticking.
Jira Cloud VS Data Center
If we were to go by Atlassian numbers, 95% of their new customers choose cloud.
“About 80% of Fortune 500 companies have an Atlassian Cloud license. More than 90% of new customers choose cloud first.” – Daniel Scott, Product Marketing Director, Tempo
So that’s settled, right? We are migrating from Server to Cloud? And what about the solution fewer people talk about yet many users rely on – Jira DC?
Both are viable options and your choice will depend greatly on the needs of your business, your available resources, and operational processes.
Let’s start by taking a look at the functionality offered by Atlassian Cloud and Atlassian DC.
| Feature | Atlassian Cloud | Atlassian Data Center |
| Product Plans | Multiple plans | One plan |
| Billing | Monthly and annual | Annual only |
| Pricing model | Per user or tiered | Tiered only |
| Support | Varying support levels depending on your plan: Enterprise support coverage is equivalent to Atlassian’s Data Center Premier Support offering | Varying support levels depending on the package: Priority Support or Premier Support (purchased separately) |
| Total Cost of Ownership | TCO includes your subscription fee, plus product administration time | TCO includes your subscription fee and product administration time, plus: costs related to infrastructure provisioning or IaaS fees (for example, AWS costs) planned downtime time and resources needed for software upgrades |
| Data encryption services |  |  |
| Data residency services | | |
| Audit logging | Organization-level audit logging available via Atlassian Access (Jira Software, Confluence) Product-level audit logs (Jira Software, Confluence) | Advanced audit logging |
| Device security | Mobile device management support (Jira Software, Confluence, Jira Service Management) Mobile application management (currently on the roadmap) | Mobile device management support (Jira Software, Confluence, Jira Service Management) |
| Content security | | |
| Data Storage limits | 2 GB (Free) 250 GB (Standard) Unlimited storage (Premium and Enterprise) | No limits |
| Performance | Continuous performance updates to improve load times, search responsiveness, and attachments Cloud infrastructure hosted in six geographic regions to reduce latency | Rate limitingCDN supports Smart mirrors and mirror farms (Bitbucket) |
| Backup and data disaster recovery | Jira leverages multiple geographically diverse data centers, has a comprehensive backup program, and gains assurance by regularly testing their disaster recovery and business continuity plans. Backups are generated daily and retained for 30 days to allow for point-in-time data restoration | |
| Containerization and orchestration | | Docker images Kubernetes support (on the roadmap for now) |
| Change management and upgrades | Atlassian automatically handles software and security upgrades for you Sandbox instance to test changes (Premium and Enterprise) Release track options for Premium and Enterprise (Jira Software, Jira Service Management, Confluence) | |
| Direct access to the database | No direct access to change the database structure, file system, or other server infrastructure Extensive REST APIs for programmatic data access | Direct database access |
| Insights and reporting | Organization and admin insights to track adoption of Atlassian products, and evaluate the security of your organization. | Data Pipeline for advanced insightsConfluence analytics |
Pros and cons of Jira Cloud
When talking about pros and cons, there’s always a chance that a competitive advantage for some is a dealbreaker for others. That’s why I decided to talk about pros and cons in matching pairs.
Pro: Scalability is one of the primary reasons businesses are choosing Jira Cloud. DC is technically also scalable, but you’ll need to scale on your own whereas the cloud version allows for the infrastructure to scale with your business.
Con: Despite the cloud’s ability to grow with your business, there is still a user limit of 35k users. In addition to that, the costs will grow alongside your needs. New users, licenses, storage, and computing power – all come at an additional cost. So, when your organization reaches a certain size, migrating to Jira DC becomes more cost-efficient.
Pro: Jira takes care of maintenance and support for you.
Con: Your business can suffer from unpredicted downtime. And there are certain security risks.
Pro: Extra bells and whistles:
- Sandbox: Sandbox is a safe environment system admins can use to test applications and integrations before rolling them out to the production environment.
- Release tracks: Admins can be more flexible with their product releases as they can access batch and control cloud releases. This means they’ll have much more time to test existing configurations and workflows against a new update.
- Insight Discovery: More data means more ways you can impact your business or product in a positive, meaningful way.
- Team Calendars: This is a handy feature for synchronization and synergy across teams.
Con: Most of these features are locked behind a paywall and are only available to either Premium and Enterprise or only Enterprise licenses (either fully or through addition of functionality. For example, Release tracks are only available to Enterprise customers.) In addition, the costs will grow as you scale the offering to fit your growing needs.
Pros and cons of Jira Data Center
I’ll be taking the same approach to talking about the pros and cons as I did when writing about Atlassian Cloud. Pros and cons are paired.
Pro: Hosting your own system means you can scale horizontally and vertically through additional hardware. Extension of your systems is seamless, and there is no downtime (if you do everything correctly). Lastly, you don’t have to worry about the user limit – there is none.
Con: While having more control over your systems is great, it implies a dedicated staff of engineers, additional expenses on software licensing, hardware, and physical space. Moreover, seamless extension and 0% downtime are entirely on you.
Pro: Atlassian has updated the DC offering with native bundled applications such as Advanced Roadmaps, team calendars and analytics for confluence, insight asset management, and insight discovery in Jira Service Management DC.
Con: Atlassian has updated their pricing to reflect these changes. And you are still getting fewer “bells and whistles” than Jira Cloud users (as we can see from the feature comparison).
Pro: You are technically safer as the system is supported on your hardware by your specialists. Any and all Jira server issues, poor updates, and downtime are simply not your concern.
Con: Atlassian offers excellent security options: data encryption in transit and rest, to mobile app management, to audit offerings and API token controls. In their absence, your team company has to dedicate additional resources to security.
Pro: Additional benefits from Atlassian, such as the Priority Support bundle (all DC subscriptions have this option), and the Data center loyalty discount (more on that in the pricing section.)
The Pricing
Talking about pricing of SaaS products is always a challenge as there are always multiple tiers and various pay-as-you go features. Barebones Jira Cloud, for instance, is completely free of charge, yet there are a series of serious limitations.
Standard Jira Cloud will cost you an average of $7.50 per user per month while premium cranks that price up to $14.50. The Enterprise plan is billed annually and the cost is determined on a case-by-case basis. You can see the full comparison of Jira Cloud plans here. And you can use this online calculator to learn the cost of ownership in your particular case.
| 50 Users | Standard (Monthly/Annually) | Premium (Monthly/Annually) |
| Jira Software | $387.50 / $3,900 | $762.50 / $7,650 |
| Jira Work Management | $250 / $2,500 | |
| Jira Service Management | $866.25 / $8,650 | $2,138.25 / $21,500 |
| Confluence | $287.50 / $2,900 | $550 / $5,500 |
| 100 Users | Standard (Monthly/Annually) | Premium (Monthly/Annually) |
| Jira Software | $775 / $7,750 | $1,525 / $15,250 |
| Jira Work Management | $500 / $5,000 | |
| Jira Service Management | $1,653.75 / $16,550 | $4,185.75 / $42,000 |
| Confluence | $575 / $5,750 | $1,100 / $11,000 |
| 500 Users | Standard (Monthly/Annually) | Premium (Monthly/Annually) |
| Jira Software | $3,140 / $31,500 | $5,107.50 / $51,000 |
| Jira Work Management | $1,850 / $18,500 | |
| Jira Service Management | $4,541.25 / $45,400 | $11,693.25 / $117,000 |
| Confluence | $2,060 / $20,500 | $3,780 / $37,800 |
Please note that these prices were calculated without any apps included.
Jira Data Center starts at $42,000 per year and the plan includes up to 500 users. If you are a new client and are not eligible for any discounts*, here’s a chart that should give you an idea as to the cost of ownership of Jira DC. You can find more information regarding your specific case here.
| Users | Commercial Annual Plan | Academic Annual Plan |
| 1-500 | USD 42,000 | USD 21,000 |
| 501-1000 | USD 72,000 | USD 36,000 |
| 1001-2000 | USD 120,000 | USD 60,000 |
| Confluence for Data Center | ||
| 1-500 | USD 27,000 | USD 13,500 |
| 501-1000 | USD 48,000 | USD 24,000 |
| 1001-2000 | USD 84,000 | USD 42,000 |
| Bitbucket for Data Center | ||
| 1-25 | USD 2,300 | USD 1,150 |
| 26-50 | USD 4,200 | USD 2,100 |
| 51-100 | USD 7,600 | USD 3,800 |
| Jira Service Management for Data Center | ||
| 1-50 | USD 17,200 | USD 8,600 |
| 51-100 | USD 28,600 | USD 14,300 |
| 101-250 | USD 51,500 | USD 25,750 |
*Discounts:
- Centralized per-user licensing allows users access all enterprise instances with a single Enterprise license.
- There’s an option for dual licensing for users who purchase an annual cloud subscription with 1,001 or more users. In this case, Atlassian extends your existing server maintenance or Data Center subscription for up to one year at a 100% discount.
- There are certain discounts for apps depending on your partnership level.
- Depending on your situation, you may qualify for several Jira Data Center discount programs:
- Academic Data Center licensing offers a 50% discount.
- Community Data Center licensing for Non-profit organizations is free of charge.
- Lastly, there is a loyalty discount for Server customers who choose to migrate to the Data Center. Check this link to find out if you are eligible.
What should be your User Migration strategy?
Originally, there were several migration methods: Jira Cloud Migration Assistant, Jira Cloud Site Import, and there was an option to migrate via CSV export (though Jira actively discourages you from using this method). However, Jira’s team has focused their efforts on improving the Migration Assistant and have chosen to discontinue Cloud Site Import support.
Thanks to the broadened functionality of the assistant, it is now the only go-to method for migration with just one exception. If you are migrating over 1000 users and you absolutely need to migrate advanced roadmaps – you’ll need to rely on Site Import. At least for now, as Jira is actively working on implementing this feature in their assistant.
Here’s a quick comparison of the options and their limitations.
| Features | Limitations | |
| Cloud Migration Assistant | App migration Existing data on a Cloud Site is not overwritten You choose the projects, users, and groups you want to migrate Jira Service Management customer account migration Better UI to guide you through the migration Potential migration errors are displayed in advance Migration can be done in phases reducing the downtime Pre- and post-migration reports | You must be on a supported self-managed version of Jira |
| Site Export | Can migrate Advanced Roadmaps | App data is not migrated Migration overrides existing data on the Cloud site Separate user importUsers from external directories are not migrated No choice of data you want or don’t want migrated There’s a need to split attachments into up to 5GB chunks Higher risks of downtime due to the “all or nothing” approach You must be on a supported self-managed version of Jira |
Pro tip: If you have a large base of users (above 2000), migrate them before you migrate projects and spaces. This way, you will not disrupt the workflow as users are still working on Server and the latter migration of data will take less time.
How to migrate to Jira Cloud
Now that we have settled on one particular offering based on available pricing models as well as the pros and the cons that matter the most to your organization, let’s talk about the “how”.
How does one migrate from Jira Server to Jira Cloud?
Pre-migration checklist
Jira’s Cloud Migration Assistant is a handy tool. It will automatically review your data for common errors. But it is incapable of doing all of the work for you. That’s why we – and Atlassian for that matter – recommend creating a pre-migration checklist.
Smart Checklist will help you craft an actionable, context-rich checklist directly inside a Jira ticket. This way, none of the tasks will be missed, lost, or abandoned.
Below is an example of how your migration checklist will look like in Jira.
Feel free to copy the code and paste it into your Smart Checklist editor and you’ll have the checklist at the ready.
# Create a user migration plan #must
> Please keep in mind that Jira Cloud Migration Assistant migrates all users and groups as well as users and groups related to selected projects
- Sync your user base
- Verify synchronization
- External users sync verification
- Active external directory verification
## Check your Jira Server version #must
- Verify via user interface or Support Zip Product Version Verification
> Jira Migration Assistant will not work unless Jira is running on a supported version
## Fix any duplicate email addresses #must
- Verify using SQL
> Duplicate email addresses are not supported by Jira Cloud and therefore can't be migrated with the Jira Cloud Migration Assistant. To avoid errors, you should find and fix any duplicate email addresses before migration. If user information is managed in an LDAP Server, you will need to update emails there and sync with Jira before the migration. If user information is managed locally, you can fix them through the Jira Server or Data Center user interface.
## Make sure you have the necessary permissions #must
- System Admin global permissions on the Server instance
- Exists in the target Cloud site
- Site Administrator Permission in the cloud
## Check for conflicts with group names #must
- Make sure that the groups in your Cloud Site don't have the same names as groups in Server
> Unless you are actively trying to merge them
- Delete or update add-on users so not to cause migration issues
- Verify via SQL
## Update firewall allowance rules #must
- None of the domains should be blocked by firewall or proxy
## Find a way to migrate apps #must
- Contact app vendors
## Check public access settings #must
- Projects
- Filters
- Filters
- Boards
- Dashboards
## Review server setup #mst
- at least 4gb Heap Allocation
- Open Files limit review
- Verify via support zip
## Check Server timezone #must for merging Cloud sites
- Switch to UTC is using any other timezone
> Add a system flag to the Jira Server instance -Duser.timezone=UTC as outlined in this article about updating documentation to include timezone details.
## Fix any duplicate shared configuration
## Storage limits
## Prepare the server instance
- Check data status
- All fields have value and are not null
-Any archived projects you wish to migrate are activated
## Prepare your cloud site
- Same Jira products enabled
- Same language
- User migration strategy
## Data backup
- Backup Jira Server site
- Backup Cloud site
## Run a test migration
- Done
## Notify Jira support
- Get in touch with Jira migration supportUse backups
On the one hand, having all of your Jira products on a server may seem like a backup in and of itself. On the other hand, there are data migration best practices we should follow even if it’s just a precaution. No one has ever felt sorry for their data being too safe.
In addition, there are certain types of migration errors that can be resolved much faster with having a backup at hand.
- Jira Server Database backup: this step creates a DB backup in an XML format.
- Log in with Jira System Admin permissions
- Go to system -> Import and Export -> Backup Manager -> Backup for server.
- Click the create Backup for server button.
- Type in the name for your backup.
- Jira will create a zipped XML file and notify you once the backup is ready.
- Jira Cloud Backup: This backup also saves your data in an XML format. The process is quite similar to creating a Jira Server backup with the only difference taking place on the Backups page.
- Select the option to save your attachments, logos, and avatars.
- Click on the Create backup button.
- As you can see, the Cloud backup includes the option to save attachments, avatars, and logos. This step should be done manually when backing up Server data.
- Create a Zip archive for this data
- Make sure it follows the structure suggested by Atlassian
Migrating your Jira instance to the cloud via the Jira Migration Assistant
Jira Cloud Migration Assistant is a free add-on Atlassian recommends using when migrating to the cloud. It accesses and evaluates your apps and helps migrate multiple projects.
Overall, the migration assistant offers a more stable and reliable migration experience. It automatically checks for certain errors. It makes sure all users have unique and valid emails, and makes sure that none of the project names and keys conflict with one another.
This is a step-by-step guide for importing your Jira Server data backup file into Jira Cloud.
- Log into Jira Cloud with admin permissions
- Go to System -> Import and Export -> External System Import
- Click on the Jira Server import option
- Select the backup Zip you have created
- Jira will check the file for errors and present you with two options: enable or disable outgoing mail. Don’t worry, you will be able to change this section after the migration process is complete.
- Then you will be presented with an option to merge Jira Server and Jira Cloud users
- Choosing overwrite will replace the users with users from the imported files
- The merge option will merge groups with the same name
- Lastly, you can select the third option if you are migrating users via Jira’s assistant
- Run the import
How do you migrate Jira Server into Jira DC?
Before we can proceed with the migration process, please make sure you meet the following prerequisites:
- Make sure you are installing Jira on one of the supported platforms. Atlassian has a list of supported platforms for Jira 9.1.
- Make sure the applications you are using are compatible with Jira DC. You will be required to switch to datacenter-compatible versions of your applications (they must be available).
- Make sure you meet the necessary software and hardware requirements:
- You have a DC license
- You are using a supported database, OS, and Java version
- You are using OAuth authentication if your application links to other Atlassian products
Once you are certain you are ready to migrate your Jira Server to Jira Data Center, you can proceed with an installation that’s much simpler than one would expect.
- Upgrade your apps to be compatible with Jira DC
- Go to Administration -> Applications -> Versions and licenses
- Enter your Jira DC License Key
- Restart Jira
That’s it. You are all set. Well, unless your organization has specific needs such as continuous uptime, performance under heavy loads, and scalability, in which case you will need to set up a server cluster. You can find out more about setting up server clusters in this guide.
1604109000
Best Practices for Using Git
Git has become ubiquitous as the preferred version control system (VCS) used by developers. Using Git adds immense value especially for engineering teams where several developers work together since it becomes critical to have a system of integrating everyone’s code reliably.
But with every powerful tool, especially one that involves collaboration with others, it is better to establish conventions to follow lest we shoot ourselves in the foot.
At DeepSource, we’ve put together some guiding principles for our own team that make working with a VCS like Git easier. Here are 5 simple rules you can follow:
1. Make Clean, Single-Purpose Commits
Oftentimes programmers working on something get sidetracked into doing too many things when working on one particular thing — like when you are trying to fix one particular bug and you spot another one, and you can’t resist the urge to fix that as well. And another one. Soon, it snowballs and you end up with so many changes all going together in one commit.
This is problematic, and it is better to keep commits as small and focused as possible for many reasons, including:
- It makes it easier for other people in the team to look at your change, making code reviews more efficient.
- If the commit has to be rolled back completely, it’s far easier to do so.
- It’s straightforward to track these changes with your ticketing system.
Additionally, it helps you mentally parse changes you’ve made using git log.
#open source #git #git basics #git tools #git best practices #git tutorials #git commit
1597916460
7 Best Practices in GIT for Your Code Quality
There is no doubt that Git plays a significant role in software development. It allows developers to work on the same code base at the same time. Still, developers struggle for code quality. Why? They fail to follow git best practices. In this post, I will explain seven core best practices of Git and a Bonus Section.
1. Atomic Commit
Committing something to Git means that you have changed your code and want to save these changes as a new trusted version.
Version control systems will not limit you in how you commit your code.
- You can commit 1000 changes in one single commit.
- Commit all the dll and other dependencies
- Or you can check in broken code to your repository.
But is it good? Not quite.
Because you are compromising code quality, and it will take more time to review code. So overall, team productivity will be reduced. The best practice is to make an atomic commit.
When you do an atomic commit, you’re committing only one change. It might be across multiple files, but it’s one single change.
2. Clarity About What You Can (& Can’t) Commit
Many developers make some changes, then commit, then push. And I have seen many repositories with unwanted files like dll, pdf, etc.
You can ask two questions to yourself, before check-in your code into the repository
- Are you suppose to check-in all these files?
- Are they part of your source code?
You can simply use the .gitignore file to avoid unwanted files in the repository. If you are working on more then one repo, it’s easy to use a global .gitignore file (without adding or pushing). And .gitignore file adds clarity and helps you to keep your code clean. What you can commit, and it will automatically ignore the unwanted files like autogenerated files like .dll and .class, etc.
#git basics #git command #git ignore #git best practices #git tutorial for beginners #git tutorials
1601157360
Mirroring Git Changes From One Server to Another Server
Introduction
Hello all, nowadays most of the development teams using GIT version control, some of you may have a requirement of mirroring your team’s git changes from one server to another Git server. This article will help you to achieve the Git mirroring between one server to another server.
Business Case
I got one assignment wherein there will be 2 Git Servers, development will happen in one Git server and the changes should be synchronized to another Git server at regular intervals. But in my case, the complexity is both the servers are in different restricted network. So I have done the small experiment and it worked. And I am sharing the steps to you all in this article.
The Experiment Performed Using Below 2 GIT Servers
Main GIT Server: Let’s take our main git server is located in our office and can be accessed only in-office network.
**Mirror GIT Server: **The mirror server is located at the vendor/client-side, which can be accessible in a normal internet connection but not with our office network. Since the office proxy will block the outside URL’s.
#devops #git #git and github #git best practices #git cloning #git server
1617875220
Git Commands You Can Use To Dig Through Your Git History
In this short article, we’ll be exploring some quick git commands that can help us in digging through our repositories’ history of commits. We’ll look at
- git log
- git shortlog
- git show
- git rev-list
#git #git-log #git-commands #git-history #aws